diff --git a/CHANGELOG.md b/CHANGELOG.md index 43669a5..1bbd815 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## chef-samples v0.1.5 (10 July 2018) +- Also supports chef 14 +- RCU 11g unzip issue with common & soa_suite recipe +- support for WebLogic/FMW 12.2.1.3 + ## chef-samples v0.1.4 (1 May 2017) - Support chef 13, use v0.1.3 release for chef 11 - Drop support for chef 11 diff --git a/README.md b/README.md index 43625fe..0c895c7 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Oracle WebLogic CHEF cookbooks ## Chef support -- Version 12, 13 ( use v0.1.3 release for chef 11 support) +- Version 12, 13, 14 ( use v0.1.3 release for chef 11 support) - Chef solo, client/server - Databags (encrypted) -## WebLogic Chef 12 & 13 Support for +## WebLogic Chef 12, 13 & 14 Support for - The installation & configuration of the JDK, WebLogic and Fusion Middleware (FMW) software - WebLogic & FMW patching - WebLogic version 10.3.6, 11.1, 12.1 & 12.2 diff --git a/fmw_bsu/metadata.rb b/fmw_bsu/metadata.rb index 855d0a2..0fdfc41 100644 --- a/fmw_bsu/metadata.rb +++ b/fmw_bsu/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Patch Oracle WebLogic 10.3.6 or 12.1.1' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.4' +version '0.1.5' recipe "fmw_bsu", "This is an empty recipe and does not do anything" diff --git a/fmw_domain/README.md b/fmw_domain/README.md index bfaf5b0..0bfd790 100644 --- a/fmw_domain/README.md +++ b/fmw_domain/README.md @@ -28,7 +28,7 @@ The fmw_domain cookbook allows you to create a WebLogic (FMW) Domain with FMW ex ## Cookbook description -This cookbook allows you to create a WebLogic (FMW) Domain (10.3.6, 12.1.1) or 12c (12.1.2, 12.1.3, 12.2.1, 12.2.1.1, 12.2.1.2 ) on any Windows, Linux or Solaris host or VM. +This cookbook allows you to create a WebLogic (FMW) Domain (10.3.6, 12.1.1) or 12c (12.1.2, 12.1.3, 12.2.1, 12.2.1.1, 12.2.1.2, 12.2.1.3 ) on any Windows, Linux or Solaris host or VM. ## Setup diff --git a/fmw_domain/libraries/helper.rb b/fmw_domain/libraries/helper.rb index 9ffce3e..405f7e4 100644 --- a/fmw_domain/libraries/helper.rb +++ b/fmw_domain/libraries/helper.rb @@ -18,7 +18,7 @@ def self.listening?(command, port, column) end def self.wlst_execute(version, os_user, script_file, weblogic_home_dir, weblogic_password, repository_password) - if version == '12.2.1' or version == '12.2.1.1' or version == '12.2.1.2' + if version == '12.2.1' or version == '12.2.1.1' or version == '12.2.1.2' or version == '12.2.1.3' wlst_script_dir = "#{weblogic_home_dir}/../oracle_common/common/bin" else wlst_script_dir = "#{weblogic_home_dir}/common/bin" @@ -30,7 +30,7 @@ def self.wlst_execute(version, os_user, script_file, weblogic_home_dir, weblogic end def self.wlst_execute_windows(version, script_file, weblogic_home_dir, weblogic_password, repository_password) - if version == '12.2.1' or version == '12.2.1.1' or version == '12.2.1.2' + if version == '12.2.1' or version == '12.2.1.1' or version == '12.2.1.2' or version == '12.2.1.3' wlst_script_dir = "#{weblogic_home_dir}\\..\\oracle_common\\common\\bin" else wlst_script_dir = "#{weblogic_home_dir}\\common\\bin" diff --git a/fmw_domain/metadata.rb b/fmw_domain/metadata.rb index bdef10a..b00b138 100644 --- a/fmw_domain/metadata.rb +++ b/fmw_domain/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Create a WebLogic (FMW) Domain with FMW extensions on a Windows, Linux or Solaris host' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.4' +version '0.1.5' recipe "fmw_domain", "This is an empty recipe and does not do anything" diff --git a/fmw_domain/recipes/domain.rb b/fmw_domain/recipes/domain.rb index 529c06a..ee89b25 100644 --- a/fmw_domain/recipes/domain.rb +++ b/fmw_domain/recipes/domain.rb @@ -41,7 +41,7 @@ fail 'did not find the data_bag_item' if domain_params.length == 0 -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(node['fmw']['version']) wls_base_template = "#{node['fmw']['weblogic_home_dir']}/common/templates/wls/wls.jar" elsif ['10.3.6', '12.1.1'].include?(node['fmw']['version']) wls_base_template = "#{node['fmw']['weblogic_home_dir']}/common/templates/domains/wls.jar" diff --git a/fmw_domain/recipes/extension_bam.rb b/fmw_domain/recipes/extension_bam.rb index e7f3571..9179e58 100644 --- a/fmw_domain/recipes/extension_bam.rb +++ b/fmw_domain/recipes/extension_bam.rb @@ -52,7 +52,7 @@ bpm_enabled = true if node['fmw_domain']['soa_suite_install_type'] == 'BPM' end -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(node['fmw']['version']) if node['fmw']['version'] == '12.1.2' return elsif node['fmw']['version'] == '12.1.3' diff --git a/fmw_domain/recipes/extension_enterprise_scheduler.rb b/fmw_domain/recipes/extension_enterprise_scheduler.rb index 45bddc3..7cf61bb 100644 --- a/fmw_domain/recipes/extension_enterprise_scheduler.rb +++ b/fmw_domain/recipes/extension_enterprise_scheduler.rb @@ -44,7 +44,7 @@ bam_cluster = '' end -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(node['fmw']['version']) if node['fmw']['version'] == '12.1.2' return elsif node['fmw']['version'] == '12.1.3' diff --git a/fmw_domain/recipes/extension_jrf.rb b/fmw_domain/recipes/extension_jrf.rb index 3fc138c..e963aa8 100644 --- a/fmw_domain/recipes/extension_jrf.rb +++ b/fmw_domain/recipes/extension_jrf.rb @@ -21,7 +21,7 @@ restricted = false -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(node['fmw']['version']) if node['fmw']['version'] == '12.1.2' wls_em_template = "#{node['fmw']['middleware_home_dir']}/em/common/templates/wls/oracle.em_wls_template_12.1.2.jar" wls_jrf_template = "#{node['fmw']['middleware_home_dir']}/oracle_common/common/templates/wls/oracle.jrf_template_12.1.2.jar" diff --git a/fmw_domain/recipes/extension_service_bus.rb b/fmw_domain/recipes/extension_service_bus.rb index 66dd53a..1a1db8b 100644 --- a/fmw_domain/recipes/extension_service_bus.rb +++ b/fmw_domain/recipes/extension_service_bus.rb @@ -52,7 +52,7 @@ bpm_enabled = true if node['fmw_domain']['soa_suite_install_type'] == 'BPM' end -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(node['fmw']['version']) if node['fmw']['version'] == '12.1.2' return elsif node['fmw']['version'] == '12.1.3' diff --git a/fmw_domain/recipes/extension_soa_suite.rb b/fmw_domain/recipes/extension_soa_suite.rb index 5224258..f4d8dd2 100644 --- a/fmw_domain/recipes/extension_soa_suite.rb +++ b/fmw_domain/recipes/extension_soa_suite.rb @@ -52,7 +52,7 @@ bpm_enabled = true if node['fmw_domain']['soa_suite_install_type'] == 'BPM' end -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(node['fmw']['version']) if node['fmw']['version'] == '12.1.2' return elsif node['fmw']['version'] == '12.1.3' diff --git a/fmw_domain/recipes/extension_webtier.rb b/fmw_domain/recipes/extension_webtier.rb index dcd8eb3..6a7a315 100644 --- a/fmw_domain/recipes/extension_webtier.rb +++ b/fmw_domain/recipes/extension_webtier.rb @@ -21,7 +21,7 @@ restricted = false -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(node['fmw']['version']) if node['fmw']['version'] == '12.1.2' wls_em_template = "#{node['fmw']['middleware_home_dir']}/em/common/templates/wls/oracle.em_wls_template_12.1.2.jar" wls_webtier_template = "#{node['fmw']['middleware_home_dir']}/ohs/common/templates/wls/ohs_managed_template_12.1.2.jar" diff --git a/fmw_domain/templates/default/domain/extensions/bam.py b/fmw_domain/templates/default/domain/extensions/bam.py index 4a370ab..1ad93d7 100644 --- a/fmw_domain/templates/default/domain/extensions/bam.py +++ b/fmw_domain/templates/default/domain/extensions/bam.py @@ -114,7 +114,7 @@ serverGroup = ["BAM12-MGD-SVRS"] if BAM_CLUSTER: - if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']: + if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3']: cleanJMS('UMSJMSSystemResource', 'UMSJMSServer_auto', 'UMSJMSFileStore_auto') print 'Add server group BAM-MGD-SVRS to cluster' @@ -158,7 +158,7 @@ closeDomain() readDomain(DOMAIN_PATH) - if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']: + if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3']: cd('/') cleanJMS('BamCQServiceJmsSystemModule', None, None) cleanJMS('UMSJMSSystemResource', 'UMSJMSServer_auto', 'UMSJMSFileStore_auto') diff --git a/fmw_domain/templates/default/domain/extensions/service_bus.py b/fmw_domain/templates/default/domain/extensions/service_bus.py index d3c2236..cc2818c 100644 --- a/fmw_domain/templates/default/domain/extensions/service_bus.py +++ b/fmw_domain/templates/default/domain/extensions/service_bus.py @@ -109,7 +109,7 @@ serverGroup = ["OSB-MGD-SVRS-COMBINED"] if OSB_CLUSTER: - if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']: + if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3']: cleanJMS('UMSJMSSystemResource', 'UMSJMSServer_auto', 'UMSJMSFileStore_auto') print 'Add server group OSB-MGD-SVRS-COMBINED to cluster' @@ -148,7 +148,7 @@ cd('/') delete('osb_server1', 'Server') - if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']: + if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3']: updateDomain() dumpStack() diff --git a/fmw_domain/templates/default/domain/extensions/soa_suite.py b/fmw_domain/templates/default/domain/extensions/soa_suite.py index 7670839..fe49177 100644 --- a/fmw_domain/templates/default/domain/extensions/soa_suite.py +++ b/fmw_domain/templates/default/domain/extensions/soa_suite.py @@ -156,7 +156,7 @@ serverGroup = ["SOA-MGD-SVRS"] if SOA_CLUSTER: - if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']: + if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3']: cleanJMS('UMSJMSSystemResource', 'UMSJMSServer_auto', 'UMSJMSFileStore_auto') print 'Add server group SOA-MGD-SVRS to cluster' @@ -195,7 +195,7 @@ cd('/') delete('soa_server1', 'Server') - if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']: + if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3']: updateDomain() dumpStack() diff --git a/fmw_inst/definitions/fmw_install.rb b/fmw_inst/definitions/fmw_install.rb index 9a0b59c..551b44b 100644 --- a/fmw_inst/definitions/fmw_install.rb +++ b/fmw_inst/definitions/fmw_install.rb @@ -20,7 +20,7 @@ group params[:os_group] cwd params[:tmp_dir] end - elsif ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(params[:version]) + elsif ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(params[:version]) execute "Install #{params[:name]}" do command "#{params[:java_home_dir]}/bin/java #{java_params} -Xmx1024m -Djava.io.tmpdir=#{params[:tmp_dir]} -jar #{params[:installer_file]} -waitforcompletion -silent -responseFile #{params[:rsp_file]} -invPtrLoc #{params[:orainst_dir]}/oraInst.loc -jreLoc #{params[:java_home_dir]}" user params[:os_user] @@ -34,7 +34,7 @@ command "#{params[:installer_file]} -silent -response #{params[:rsp_file]} -waitforcompletion -jreLoc #{params[:java_home_dir]} -ignoreSysPrereqs -Djava.io.tmpdir=#{params[:tmp_dir]}" cwd params[:tmp_dir] end - elsif ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(params[:version]) + elsif ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(params[:version]) execute "Install #{params[:name]}" do command "#{params[:java_home_dir]}\\bin\\java.exe -Xmx1024m -Djava.io.tmpdir=#{params[:tmp_dir]} -jar #{params[:installer_file]} -waitforcompletion -silent -responseFile #{params[:rsp_file]} -jreLoc #{params[:java_home_dir]}" cwd params[:tmp_dir] diff --git a/fmw_inst/metadata.rb b/fmw_inst/metadata.rb index aa92719..fae7c02 100644 --- a/fmw_inst/metadata.rb +++ b/fmw_inst/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Installs FMW Software on a WebLogic middleware environmment' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.4' +version '0.1.5' recipe "fmw_inst", "This is an empty recipe and does not do anything" diff --git a/fmw_inst/recipes/jrf.rb b/fmw_inst/recipes/jrf.rb index eef255c..81d9a17 100644 --- a/fmw_inst/recipes/jrf.rb +++ b/fmw_inst/recipes/jrf.rb @@ -10,7 +10,7 @@ fail 'fmw_inst attributes cannot be empty' unless node.attribute?('fmw_inst') -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(node['fmw']['version']) return elsif ['10.3.6'].include?(node['fmw']['version']) diff --git a/fmw_inst/recipes/mft.rb b/fmw_inst/recipes/mft.rb index 41f0d09..3bf43cc 100644 --- a/fmw_inst/recipes/mft.rb +++ b/fmw_inst/recipes/mft.rb @@ -10,7 +10,7 @@ fail 'fmw_inst attributes cannot be empty' unless node.attribute?('fmw_inst') -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3'].include?(node['fmw']['version']) fmw_template = 'fmw_12c.rsp' fmw_oracle_home = node['fmw']['middleware_home_dir'] + '/mft/bin' install_type = 'Typical' @@ -24,6 +24,8 @@ fmw_installer_file = node['fmw']['tmp_dir'] + '/mft/fmw_12.2.1.1.0_mft.jar' elsif node['fmw']['version'] == '12.2.1.2' fmw_installer_file = node['fmw']['tmp_dir'] + '/mft/fmw_12.2.1.2.0_mft.jar' + elsif node['fmw']['version'] == '12.2.1.3' + fmw_installer_file = node['fmw']['tmp_dir'] + '/mft/fmw_12.2.1.3.0_mft.jar' end elsif ['10.3.6'].include?(node['fmw']['version']) @@ -47,7 +49,7 @@ option_array: option_array) end -if ['12.1.3', '12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) +if ['12.1.3', '12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3'].include?(node['fmw']['version']) fmw_inst_fmw_extract 'mft' do action :extract source_file node['fmw_inst']['mft_source_file'] diff --git a/fmw_inst/recipes/service_bus.rb b/fmw_inst/recipes/service_bus.rb index 873f826..2984fc3 100644 --- a/fmw_inst/recipes/service_bus.rb +++ b/fmw_inst/recipes/service_bus.rb @@ -10,7 +10,7 @@ fail 'fmw_inst attributes cannot be empty' unless node.attribute?('fmw_inst') -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3'].include?(node['fmw']['version']) fmw_template = 'fmw_12c.rsp' fmw_oracle_home = node['fmw']['middleware_home_dir'] + '/osb/bin' install_type = 'Service Bus' @@ -24,6 +24,8 @@ fmw_installer_file = node['fmw']['tmp_dir'] + '/service_bus/fmw_12.2.1.1.0_osb.jar' elsif node['fmw']['version'] == '12.2.1.2' fmw_installer_file = node['fmw']['tmp_dir'] + '/service_bus/fmw_12.2.1.2.0_osb.jar' + elsif node['fmw']['version'] == '12.2.1.3' + fmw_installer_file = node['fmw']['tmp_dir'] + '/service_bus/fmw_12.2.1.3.0_osb.jar' end elsif ['10.3.6'].include?(node['fmw']['version']) @@ -60,7 +62,7 @@ option_array: option_array) end -if ['10.3.6', '12.1.3', '12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) +if ['10.3.6', '12.1.3', '12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3'].include?(node['fmw']['version']) fmw_inst_fmw_extract 'service_bus' do action :extract source_file node['fmw_inst']['service_bus_source_file'] diff --git a/fmw_inst/recipes/soa_suite.rb b/fmw_inst/recipes/soa_suite.rb index b45fd8d..48c08a6 100644 --- a/fmw_inst/recipes/soa_suite.rb +++ b/fmw_inst/recipes/soa_suite.rb @@ -10,7 +10,7 @@ fail 'fmw_inst attributes cannot be empty' unless node.attribute?('fmw_inst') -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3'].include?(node['fmw']['version']) fmw_template = 'fmw_12c.rsp' fmw_oracle_home = node['fmw']['middleware_home_dir'] + '/soa/bin' option_array = [] @@ -36,6 +36,8 @@ fmw_installer_file = node['fmw']['tmp_dir'] + '/soa_suite/fmw_12.2.1.1.0_soa.jar' elsif node['fmw']['version'] == '12.2.1.2' fmw_installer_file = node['fmw']['tmp_dir'] + '/soa_suite/fmw_12.2.1.2.0_soa.jar' + elsif node['fmw']['version'] == '12.2.1.3' + fmw_installer_file = node['fmw']['tmp_dir'] + '/soa_suite/fmw_12.2.1.3.0_soa.jar' end elsif ['10.3.6'].include?(node['fmw']['version']) @@ -69,7 +71,7 @@ option_array: option_array) end -if ['10.3.6', '12.1.3', '12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) +if ['10.3.6', '12.1.3', '12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3'].include?(node['fmw']['version']) fmw_inst_fmw_extract 'soa_suite' do action :extract source_file node['fmw_inst']['soa_suite_source_file'] diff --git a/fmw_inst/recipes/webcenter.rb b/fmw_inst/recipes/webcenter.rb index 9949ef5..eb1f7dc 100644 --- a/fmw_inst/recipes/webcenter.rb +++ b/fmw_inst/recipes/webcenter.rb @@ -18,7 +18,7 @@ node.override['fmw']['install_type']='typical' end -if ['12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3'].include?(node['fmw']['version']) fmw_template = 'fmw_12c.rsp' fmw_oracle_home = node['fmw']['middleware_home_dir'] + '/wcportal' option_array = [] @@ -30,6 +30,8 @@ fmw_installer_file = node['fmw']['tmp_dir'] + '/webcenter/fmw_12.2.1.1.0_wcportal.jar' elsif node['fmw']['version'] == '12.2.1.2' fmw_installer_file = node['fmw']['tmp_dir'] + '/webcenter/fmw_12.2.1.2.0_wcportal.jar' + elsif node['fmw']['version'] == '12.2.1.3' + fmw_installer_file = node['fmw']['tmp_dir'] + '/webcenter/fmw_12.2.1.3.0_wcportal.jar' end elsif ['10.3.6'].include?(node['fmw']['version']) diff --git a/fmw_jdk/metadata.rb b/fmw_jdk/metadata.rb index 8e84551..8e085b6 100644 --- a/fmw_jdk/metadata.rb +++ b/fmw_jdk/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Installs Oracle JDK 7,8 on any Windows, Linux or Solaris host' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.4' +version '0.1.5' recipe "fmw_jdk", "This is an empty recipe and does not do anything" diff --git a/fmw_opatch/metadata.rb b/fmw_opatch/metadata.rb index bb23174..9a31474 100644 --- a/fmw_opatch/metadata.rb +++ b/fmw_opatch/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Patch Oracle WebLogic 12c or any FMW 11g or 12c product' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.4' +version '0.1.5' recipe "fmw_opatch", "This is an empty recipe and does not do anything" diff --git a/fmw_opatch/recipes/service_bus.rb b/fmw_opatch/recipes/service_bus.rb index bd78c11..8e048d9 100644 --- a/fmw_opatch/recipes/service_bus.rb +++ b/fmw_opatch/recipes/service_bus.rb @@ -13,7 +13,7 @@ fail 'source_file parameter cannot be empty' unless node['fmw_opatch'].attribute?('service_bus_source_file') fail 'patch_id parameter cannot be empty' unless node['fmw_opatch'].attribute?('service_bus_patch_id') -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3'].include?(node['fmw']['version']) fmw_oracle_home = node['fmw']['middleware_home_dir'] elsif ['10.3.6'].include?(node['fmw']['version']) if node['os'].include?('windows') diff --git a/fmw_opatch/recipes/soa_suite.rb b/fmw_opatch/recipes/soa_suite.rb index 2f39cfb..48131ca 100644 --- a/fmw_opatch/recipes/soa_suite.rb +++ b/fmw_opatch/recipes/soa_suite.rb @@ -13,7 +13,7 @@ fail 'source_file parameter cannot be empty' unless node['fmw_opatch'].attribute?('soa_suite_source_file') fail 'patch_id parameter cannot be empty' unless node['fmw_opatch'].attribute?('soa_suite_patch_id') -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3'].include?(node['fmw']['version']) fmw_oracle_home = node['fmw']['middleware_home_dir'] elsif ['10.3.6'].include?(node['fmw']['version']) if node['os'].include?('windows') diff --git a/fmw_rcu/metadata.rb b/fmw_rcu/metadata.rb index 8dec534..ec07cce 100644 --- a/fmw_rcu/metadata.rb +++ b/fmw_rcu/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Installs Oracle WebLogic 11g,12c on any Windows, Linux or Solaris host' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.4' +version '0.1.5' recipe "fmw_rcu", "This is an empty recipe and does not do anything" diff --git a/fmw_rcu/recipes/common.rb b/fmw_rcu/recipes/common.rb index 89bbb55..0497fc1 100644 --- a/fmw_rcu/recipes/common.rb +++ b/fmw_rcu/recipes/common.rb @@ -20,12 +20,12 @@ include_recipe 'fmw_wls::install' -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3'].include?(node['fmw']['version']) fail 'oracle_home_dir parameter cannot be empty' unless node['fmw_rcu'].attribute?('oracle_home_dir') oracle_home_dir = node['fmw_rcu']['oracle_home_dir'] end -if ['12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3'].include?(node['fmw']['version']) component_array = ['MDS', 'IAU', @@ -55,10 +55,9 @@ 'OPSS', 'ORASDPM'] - if platform_family?('windows') - - path = "#{node['fmw']['middleware_home_dir']}\\wlserver_10.3\\server\\adr" + path = ::File.join(node['fmw']['middleware_home_dir'],'wlserver_10.3','server','adr') + if platform_family?('windows') execute "extract rcu file" do command "#{path}\\unzip.exe -o #{node['fmw_rcu']['source_file']} -d #{node['fmw']['tmp_dir']}\\rcu" cwd node['fmw']['tmp_dir'] @@ -67,7 +66,7 @@ oracle_home_dir = "#{node['fmw']['tmp_dir']}\\rcu\\rcuHome" else execute "extract rcu file" do - command "unzip -o #{node['fmw_rcu']['source_file']} -d #{node['fmw']['tmp_dir']}/rcu" + command "#{path}/unzip -o #{node['fmw_rcu']['source_file']} -d #{node['fmw']['tmp_dir']}/rcu" cwd node['fmw']['tmp_dir'] user node['fmw']['os_user'] group node['fmw']['os_group'] diff --git a/fmw_rcu/recipes/soa_suite.rb b/fmw_rcu/recipes/soa_suite.rb index e414693..faeb4aa 100644 --- a/fmw_rcu/recipes/soa_suite.rb +++ b/fmw_rcu/recipes/soa_suite.rb @@ -18,14 +18,14 @@ rcu_params = rcu_params.to_hash if rcu_params.instance_of? Chef::EncryptedDataBagItem fail 'did not find the data_bag_item' if rcu_params.length == 0 -if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3'].include?(node['fmw']['version']) include_recipe 'fmw_wls::install' fail 'oracle_home_dir parameter cannot be empty' unless node['fmw_rcu'].attribute?('oracle_home_dir') oracle_home_dir = node['fmw_rcu']['oracle_home_dir'] end -if ['12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3'].include?(node['fmw']['version']) component_array = ['MDS', 'IAU', @@ -63,7 +63,7 @@ 'BAM'] path = ::File.join(node['fmw']['middleware_home_dir'],'wlserver_10.3','server','adr') - + if platform_family?('windows') execute "extract rcu file" do command "#{path}\\unzip.exe -o #{node['fmw_rcu']['source_file']} -d #{node['fmw']['tmp_dir']}\\rcu" diff --git a/fmw_wls/README.md b/fmw_wls/README.md index 9b9c428..1a3ba1c 100644 --- a/fmw_wls/README.md +++ b/fmw_wls/README.md @@ -21,7 +21,7 @@ The fmw_wls cookbook allows you to install Oracle WebLogic on a Windows, Linux o ## Cookbook description -This cookbook allows you to install any WebLogic 11g (10.3.6, 12.1.1) or 12c (12.1.2, 12.1.3, 12.2.1, 12.2.1.1, 12.2.1.2 ) version on any Windows, Linux or Solaris host or VM. +This cookbook allows you to install any WebLogic 11g (10.3.6, 12.1.1) or 12c (12.1.2, 12.1.3, 12.2.1, 12.2.1.1, 12.2.1.2, 12.2.1.3 ) version on any Windows, Linux or Solaris host or VM. ## Setup @@ -33,7 +33,7 @@ Add this cookbook to your chef cookbook folder, add fmw_wls recipes to the run l Cookbook defaults - default['fmw']['version'] = '12.1.3' # 10.3.6|12.1.1|12.1.2|12.1.3|12.2.1|12.2.1.1|12.2.1.2 + default['fmw']['version'] = '12.1.3' # 10.3.6|12.1.1|12.1.2|12.1.3|12.2.1|12.2.1.1|12.2.1.2|12.2.1.3 default['fmw_wls']['install_type'] = 'wls' # infra or wls if platform_family?('windows') diff --git a/fmw_wls/attributes/default.rb b/fmw_wls/attributes/default.rb index 3a7379d..26a8c13 100644 --- a/fmw_wls/attributes/default.rb +++ b/fmw_wls/attributes/default.rb @@ -1,5 +1,5 @@ -default['fmw']['version'] = '12.1.3' # 10.3.6|12.1.1|12.1.2|12.1.3|12.2.1|12.2.1.1|12.2.1.2 +default['fmw']['version'] = '12.1.3' # 10.3.6|12.1.1|12.1.2|12.1.3|12.2.1|12.2.1.1|12.2.1.2|12.2.1.3 default['fmw_wls']['install_type'] = 'wls' # infra or wls default['fmw']['prod_name'] = nil diff --git a/fmw_wls/definitions/wls_install.rb b/fmw_wls/definitions/wls_install.rb index e728e29..8cc4a79 100644 --- a/fmw_wls/definitions/wls_install.rb +++ b/fmw_wls/definitions/wls_install.rb @@ -4,7 +4,7 @@ # # Copyright 2015 Oracle. All Rights Reserved # -define :wls_install, :unix => true, :middleware_home_dir => nil, :java_home_dir => nil, :tmp_dir => nil, :version => nil, :os_group => nil, :os_user => nil, :source_file => nil, :template => nil, :orainst_dir => nil do +define :wls_install, :unix => true, :middleware_home_dir => nil, :java_home_dir => nil, :tmp_dir => nil, :version => nil, :os_group => nil, :os_user => nil, :source2_file => nil, :template => nil, :orainst_dir => nil do if params[:unix] if ['solaris2'].include?(node['os']) @@ -15,16 +15,16 @@ if ['10.3.6', '12.1.1'].include?(params[:version]) execute 'Install WLS' do - command "#{params[:java_home_dir]}/bin/java #{java_params} -Xmx1024m -Djava.io.tmpdir=#{params[:tmp_dir]} -Duser.country=US -Duser.language=en -jar #{params[:source_file]} -mode=silent -silent_xml=#{params[:tmp_dir]}/#{params[:template]} -log=#{params[:tmp_dir]}/wls.log -log_priority=info" + command "#{params[:java_home_dir]}/bin/java #{java_params} -Xmx1024m -Djava.io.tmpdir=#{params[:tmp_dir]} -Duser.country=US -Duser.language=en -jar #{params[:source2_file]} -mode=silent -silent_xml=#{params[:tmp_dir]}/#{params[:template]} -log=#{params[:tmp_dir]}/wls.log -log_priority=info" environment('JAVA_VENDOR' => 'Sun', 'JAVA_HOME' => params[:java_home_dir]) user params[:os_user] group params[:os_group] cwd params[:tmp_dir] end - elsif ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(params[:version]) + elsif ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(params[:version]) execute 'Install WLS' do - command "#{params[:java_home_dir]}/bin/java #{java_params} -Xmx1024m -Djava.io.tmpdir=#{params[:tmp_dir]} -jar #{params[:source_file]} -silent -responseFile #{params[:tmp_dir]}/#{params[:template]} -invPtrLoc #{params[:orainst_dir]}/oraInst.loc" + command "#{params[:java_home_dir]}/bin/java #{java_params} -Xmx1024m -Djava.io.tmpdir=#{params[:tmp_dir]} -jar #{params[:source2_file]} -silent -responseFile #{params[:tmp_dir]}/#{params[:template]} -invPtrLoc #{params[:orainst_dir]}/oraInst.loc" user params[:os_user] group params[:os_group] cwd params[:tmp_dir] @@ -33,13 +33,13 @@ else if ['10.3.6', '12.1.1'].include?(params[:version]) execute 'Install WLS' do - command "#{params[:java_home_dir]}\\bin\\java.exe -Xmx1024m -Djava.io.tmpdir=#{params[:tmp_dir]} -Duser.country=US -Duser.language=en -jar #{params[:source_file]} -mode=silent -silent_xml=#{params[:tmp_dir]}/#{params[:template]} -log=#{params[:tmp_dir]}/wls.log -log_priority=info" + command "#{params[:java_home_dir]}\\bin\\java.exe -Xmx1024m -Djava.io.tmpdir=#{params[:tmp_dir]} -Duser.country=US -Duser.language=en -jar #{params[:source2_file]} -mode=silent -silent_xml=#{params[:tmp_dir]}/#{params[:template]} -log=#{params[:tmp_dir]}/wls.log -log_priority=info" environment('JAVA_VENDOR' => 'Sun', 'JAVA_HOME' => params[:java_home_dir]) end - elsif ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(params[:version]) + elsif ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(params[:version]) execute 'Install WLS' do - command "#{params[:java_home_dir]}\\bin\\java.exe -Xmx1024m -Djava.io.tmpdir=#{params[:tmp_dir]} -jar #{params[:source_file]} -silent -responseFile #{params[:tmp_dir]}/#{params[:template]} -logLevel fine" + command "#{params[:java_home_dir]}\\bin\\java.exe -Xmx1024m -Djava.io.tmpdir=#{params[:tmp_dir]} -jar #{params[:source2_file]} -silent -responseFile #{params[:tmp_dir]}/#{params[:template]} -logLevel fine" end end end diff --git a/fmw_wls/metadata.rb b/fmw_wls/metadata.rb index e8ce136..54f8bdc 100644 --- a/fmw_wls/metadata.rb +++ b/fmw_wls/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Installs Oracle WebLogic 11g, 12c on any Windows, Linux or Solaris host' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.4' +version '0.1.5' recipe "fmw_wls", "This is an empty recipe and does not do anything" diff --git a/fmw_wls/providers/wls_linux.rb b/fmw_wls/providers/wls_linux.rb index 6bfed65..43fefe6 100644 --- a/fmw_wls/providers/wls_linux.rb +++ b/fmw_wls/providers/wls_linux.rb @@ -80,7 +80,7 @@ def load_current_resource action :create end - if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(version) + if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(version) template = 'wls_12c.rsp' elsif ['10.3.6', '12.1.1'].include?(version) template = 'wls_11g.rsp' @@ -102,7 +102,7 @@ def load_current_resource version version os_group os_group os_user os_user - source_file source_file + source2_file source_file template template orainst_dir orainst_dir end diff --git a/fmw_wls/providers/wls_solaris.rb b/fmw_wls/providers/wls_solaris.rb index 09ce6c2..5e510b1 100644 --- a/fmw_wls/providers/wls_solaris.rb +++ b/fmw_wls/providers/wls_solaris.rb @@ -86,7 +86,7 @@ def load_current_resource action :create end - if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(version) + if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(version) template = 'wls_12c.rsp' elsif ['10.3.6', '12.1.1'].include?(version) template = 'wls_11g.rsp' @@ -108,7 +108,7 @@ def load_current_resource version version os_group os_group os_user os_user - source_file source_file + source2_file source_file template template orainst_dir orainst_dir end diff --git a/fmw_wls/providers/wls_windows.rb b/fmw_wls/providers/wls_windows.rb index 90d41b5..70ebc45 100644 --- a/fmw_wls/providers/wls_windows.rb +++ b/fmw_wls/providers/wls_windows.rb @@ -40,13 +40,12 @@ def load_current_resource Chef::Log.info("#{@new_resource} doesn't exist, so lets install weblogic") converge_by("Create resource #{ @new_resource }") do - ora_inventory_dir = @new_resource.ora_inventory_dir middleware_home_dir = @new_resource.name version = @new_resource.version tmp_dir = @new_resource.tmp_dir java_home_dir = @new_resource.java_home_dir - source_file = @new_resource.source_file + source_file = @new_resource.source_file install_type = @new_resource.install_type registry_key 'HKEY_LOCAL_MACHINE\SOFTWARE\Oracle' do @@ -54,7 +53,7 @@ def load_current_resource action :create_if_missing end - if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(version) + if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.2.1.3', '12.1.3', '12.1.2'].include?(version) template = 'wls_12c.rsp' elsif ['10.3.6', '12.1.1'].include?(version) template = 'wls_11g.rsp' @@ -68,13 +67,15 @@ def load_current_resource tmp_dir tmp_dir end + Chef::Log.info("#{@new_resource} source_file is #{source_file} ") + wls_install 'windows' do unix false middleware_home_dir middleware_home_dir java_home_dir java_home_dir tmp_dir tmp_dir version version - source_file source_file + source2_file source_file template template end