added chef 14 plus 12.2.1.3 support

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

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

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"

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
 

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"

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"

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"

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'

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'

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"

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'

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'

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"

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')

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()
 

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()
 

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]

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"

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'])

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']

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']

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']

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'])

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"

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"

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')

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')

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"