Work started on supported chef 13 & drop chef 11

Edwin Biemond · Edwin Biemond · commit 27d9be784e61 · 2017-05-01T14:42:50.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,15 @@
 # Change Log
 
+## chef-samples v0.1.4 (1 May 2017)
+- Support chef 13, use v0.1.3 release for chef 11
+- Drop support for chef 11
+- allow to name the windows nodemanager
+
 ## chef-samples v0.1.3 (6 Dec 2016)
 
 - support for WebLogic/FMW 12.2.1.2
 - state_attr fixes in some resources
-- fmw_inst fix in version 
+- fmw_inst fix in version
 
 ## chef-samples v0.1.2 (12 Jul 2016)
 
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # Oracle WebLogic CHEF cookbooks
 
 ## Chef support
-- Version 11, 12
+- Version 12, 13 ( for use v0.1.3 release for chef 11)
 - Chef solo, client/server
 - Databags (encrypted)
 
-## WebLogic Chef 11 & 12 Support for
+## WebLogic Chef 12 & 13 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
@@ -15,7 +15,7 @@
 	- Extend the domain with ADF/JRF, SOA Suite, Service Bus, Webtier etc
 
 ## Restrictions
-- Will not download of all the required JDK, WebLogic or FMW software from OTN. They should be available on the host (local or from a share) 
+- Will not download of all the required JDK, WebLogic or FMW software from OTN. They should be available on the host (local or from a share)
 - Does not download patches from https://support.oracle.com
 - Does not give you the right to use all the FMW software
 - Check your license or make sure you comply with the OTN developer license agreement
diff --git a/fmw_domain/providers/nodemanager_service_windows.rb b/fmw_domain/providers/nodemanager_service_windows.rb
@@ -77,7 +77,7 @@ def load_current_resource
           cwd new_resource.bin_dir
           environment ({ 'CLASSPATH' => "#{new_resource.middleware_home_dir}\\wlserver_10.3\\server\\lib\\weblogic.jar",
                          'JAVA_HOME' => new_resource.java_home_dir,
-                         'PROD_NAME'    => local_prod_name,
+                         'PROD_NAME' => local_prod_name,
                          'SERVICE_DESCRIPTION' => new_resource.service_description })
         end
       else
diff --git a/fmw_jdk/.kitchen.yml b/fmw_jdk/.kitchen.yml
@@ -1,10 +1,11 @@
 ---
 driver:
   name: vagrant
-  provider: vmware_fusion
+  # provider: vmware_fusion
 
 provisioner:
   name: chef_solo
+  # require_chef_omnibus: 12
 
 platforms:
   - name: debian-7.2.0
@@ -13,23 +14,23 @@ platforms:
         memory: 2048
         cpus: 1
       synced_folders:
-        - ["/Users/edwinbiemond/software", "/software"]
+        - ["C:/software", "/software"]
   - name: oel-7.0
     driver_config:
-      box: OEL-7.2-x86_64
+      box: OEL7_2-x86_64
       customize:
         memory: 2048
         cpus: 1
       synced_folders:
-        - ["/Users/edwinbiemond/software", "/software"]
+        - ["C:/software", "/software"]
   - name: oel-6.6
     driver_config:
-      box: OEL6_6-x86_64
+      box: OEL6_6-x86_64_plain
       customize:
         memory: 2048
         cpus: 1
       synced_folders:
-        - ["/Users/edwinbiemond/software", "/software"]
+        - ["C:/software", "/software"]
   - name: oel-5.8
     driver_config:
       box: OEL-5.8
@@ -63,7 +64,7 @@ platforms:
         memory: 3072
         cpus: 2
       synced_folders:
-        - ["/Users/edwinbiemond/software", "/software"]
+        - ["C:/software", "/software"]
   - name: windows-8.1
     transport:
       name: winrm
@@ -73,17 +74,17 @@ platforms:
         memory: 3072
         cpus: 2
       synced_folders:
-        - ["/Users/edwinbiemond/software", "/software"]
+        - ["C:/software", "/software"]
 
 suites:
   - name: exe
     run_list:
       - recipe[fmw_jdk::install]
     attributes:
       fmw:
-        java_home_dir:    "C:/java/jdk1.8.0_111"
+        java_home_dir:    "C:/java/jdk1.8.0_131"
       fmw_jdk:
-        source_file:      "/Users/edwinbiemond/software/jdk-8u111-windows-x64.exe"
+        source_file:      "C:/software/jdk-8u131-windows-x64.exe"
     excludes:
       - debian-7.2.0
       - oel-7.0
@@ -97,9 +98,9 @@ suites:
       - recipe[fmw_jdk::rng_service]
     attributes:
       fmw:
-        java_home_dir:    "/usr/java/jdk1.8.0_111"
+        java_home_dir:    "/usr/java/jdk1.8.0_131"
       fmw_jdk:
-        source_file:      "/software/jdk-8u111-linux-x64.rpm"
+        source_file:      "/software/jdk-8u131-linux-x64.rpm"
     excludes:
       - debian-7.2.0
       - windows-2012r2
@@ -127,9 +128,9 @@ suites:
       - recipe[fmw_jdk::rng_service]
     attributes:
       fmw:
-        java_home_dir:    "/usr/java/jdk1.8.0_111"
+        java_home_dir:    "/usr/java/jdk1.8.0_131"
       fmw_jdk:
-        source_file:      "/software/jdk-8u111-linux-x64.tar.gz"
+        source_file:      "/software/jdk-8u131-linux-x64.tar.gz"
     excludes:
       - windows-2012r2
       - windows-8.1
@@ -154,9 +155,9 @@ suites:
       - recipe[fmw_jdk::install]
     attributes:
       fmw:
-        java_home_dir:    "/usr/jdk/instances/jdk1.8.0_40"
+        java_home_dir:    "/usr/jdk/instances/jdk1.8.0_131"
       fmw_jdk:
-        source_file:      "/software/jdk-8u40-solaris-x64.tar.gz"
+        source_file:      "/software/jdk-8u131-solaris-x64.tar.gz"
     excludes:
       - windows-2012r2
       - windows-8.1
diff --git 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.3'
+version          '0.1.4'
 
 recipe            "fmw_jdk",
                   "This is an empty recipe and does not do anything"
diff --git a/fmw_jdk/providers/jdk_linux.rb b/fmw_jdk/providers/jdk_linux.rb
@@ -25,7 +25,7 @@ def initialize(*args)
 
 def load_current_resource
   Chef::Log.info('jdk provider, jdk_linux provider load current resource')
-  @current_resource ||= Chef::Resource::FmwJdkJdkLinux.new(new_resource.name)
+  @current_resource ||= Chef::ResourceResolver.resolve(:fmw_jdk_jdk_linux).new(new_resource.name)
   @current_resource.java_home_dir(@new_resource.java_home_dir)
   @current_resource.source_file(@new_resource.source_file)
 
diff --git a/fmw_jdk/providers/jdk_linux_rpm.rb b/fmw_jdk/providers/jdk_linux_rpm.rb
@@ -28,7 +28,7 @@ def initialize(*args)
 
 def load_current_resource
   Chef::Log.info('jdk provider, jdk_linux_rpm provider load current resource')
-  @current_resource ||= Chef::Resource::FmwJdkJdkLinuxRpm.new(new_resource.name)
+  @current_resource ||= Chef::ResourceResolver.resolve(:fmw_jdk_jdk_linux_rpm).new(new_resource.name)
   @current_resource.java_home_dir(@new_resource.java_home_dir)
   @current_resource.source_file(@new_resource.source_file)
 
diff --git a/fmw_jdk/providers/jdk_solaris.rb b/fmw_jdk/providers/jdk_solaris.rb
@@ -26,7 +26,7 @@ def initialize(*args)
 
 def load_current_resource
   Chef::Log.info('jdk provider, jdk_solaris provider load current resource')
-  @current_resource ||= Chef::Resource::FmwJdkJdkSolaris.new(new_resource.name)
+  @current_resource ||= Chef::ResourceResolver.resolve(:fmw_jdk_jdk_solaris).new(new_resource.name)
   @current_resource.java_home_dir(@new_resource.java_home_dir)
   @current_resource.source_file(@new_resource.source_file)
   @current_resource.source_x64_file(@new_resource.source_x64_file)
diff --git a/fmw_jdk/providers/jdk_solaris_z.rb b/fmw_jdk/providers/jdk_solaris_z.rb
@@ -26,7 +26,7 @@ def initialize(*args)
 
 def load_current_resource
   Chef::Log.info('jdk provider, jdk_solaris_z provider load current resource')
-  @current_resource ||= Chef::Resource::FmwJdkJdkSolarisZ.new(new_resource.name)
+  @current_resource ||= Chef::ResourceResolver.resolve(:fmw_jdk_jdk_solaris_z).new(new_resource.name)
   @current_resource.java_home_dir(@new_resource.java_home_dir)
   @current_resource.source_file(@new_resource.source_file)
   @current_resource.source_x64_file(@new_resource.source_x64_file)
diff --git a/fmw_jdk/providers/jdk_windows.rb b/fmw_jdk/providers/jdk_windows.rb
@@ -21,7 +21,7 @@ def initialize(*args)
 
 def load_current_resource
   Chef::Log.info('jdk provider, jdk_windows provider load current resource')
-  @current_resource ||= Chef::Resource::FmwJdkJdkWindows.new(new_resource.name)
+  @current_resource ||= Chef::ResourceResolver.resolve(:fmw_jdk_jdk_windows).new(new_resource.name)
   @current_resource.java_home_dir(@new_resource.java_home_dir)
   @current_resource.source_file(@new_resource.source_file)
 
diff --git a/fmw_jdk/providers/rng_service_debian.rb b/fmw_jdk/providers/rng_service_debian.rb
@@ -13,7 +13,7 @@ def whyrun_supported?
 
 def load_current_resource
   Chef::Log.info('rng_service provider, rng_service_debian provider load current resource')
-  @current_resource ||= Chef::Resource::FmwJdkRngServiceDebian.new(new_resource.name)
+  @current_resource ||= Chef::ResourceResolver.resolve(:fmw_jdk_rng_service_debian).new(new_resource.name)
   @current_resource
 end
 
diff --git a/fmw_jdk/providers/rng_service_redhat.rb b/fmw_jdk/providers/rng_service_redhat.rb
@@ -17,7 +17,7 @@ def whyrun_supported?
 
 def load_current_resource
   Chef::Log.info('rng_service provider, rng_service_redhat provider load current resource')
-  @current_resource ||= Chef::Resource::FmwJdkRngServiceRedhat.new(new_resource.name)
+  @current_resource ||= Chef::ResourceResolver.resolve(:fmw_jdk_rng_service_redhat).new(new_resource.name)
   @current_resource
 end
 
diff --git a/fmw_jdk/providers/rng_service_redhat_7.rb b/fmw_jdk/providers/rng_service_redhat_7.rb
@@ -17,7 +17,7 @@ def whyrun_supported?
 
 def load_current_resource
   Chef::Log.info('rng_service provider, rng_service_redhat_7 provider load current resource')
-  @current_resource ||= Chef::Resource::FmwJdkRngServiceRedhat7.new(new_resource.name)
+  @current_resource ||= Chef::ResourceResolver.resolve(:fmw_jdk_rng_service_redhat_7).new(new_resource.name)
   @current_resource
 end
 
diff --git a/fmw_jdk/recipes/install.rb b/fmw_jdk/recipes/install.rb
@@ -46,31 +46,11 @@
   end
 end
 
-if VERSION.start_with? '11.'
-  ruby_block "loading for chef 11 jdk install" do
-    block do
-      if node['os'].include?('linux')
-        res = Chef::Resource::Chef::Resource::FmwJdkJdkLinux.new( node['fmw']['java_home_dir'], run_context ) if node['fmw_jdk']['install_type'] == 'tar.gz'
-        res = Chef::Resource::Chef::Resource::FmwJdkJdkLinuxRpm.new( node['fmw']['java_home_dir'], run_context ) if node['fmw_jdk']['install_type'] == 'rpm'
-      elsif node['os'].include?('solaris2')
-        res = Chef::Resource::Chef::Resource::FmwJdkJdkSolaris.new( node['fmw']['java_home_dir'], run_context ) if node['fmwjdk']['install_type'] == 'tar.gz'
-        res = Chef::Resource::Chef::Resource::FmwJdkJdkSolarisZ.new( node['fmw']['java_home_dir'], run_context ) if node['fmwjdk']['install_type'] == 'tar.Z'
-      else
-        res = Chef::Resource::Chef::Resource::FmwJdkJdkWindows.new( node['fmw']['java_home_dir'], run_context )
-      end
-      res.java_home_dir   node['fmw']['java_home_dir']
-      res.source_file     node['fmw_jdk']['source_file']
-      res.source_x64_file node['fmw_jdk']['source_x64_file'] if node['os'].include?('solaris2')
-      res.run_action      :install
-    end
-  end
-else
-  fmw_jdk_jdk node['fmw']['java_home_dir'] do
-    action          :install
-    java_home_dir   node['fmw']['java_home_dir']
-    source_file     node['fmw_jdk']['source_file']
-    source_x64_file node['fmw_jdk']['source_x64_file'] if node['os'].include?('solaris2')
-  end
+fmw_jdk_jdk node['fmw']['java_home_dir'] do
+  action          :install
+  java_home_dir   node['fmw']['java_home_dir']
+  source_file     node['fmw_jdk']['source_file']
+  source_x64_file node['fmw_jdk']['source_x64_file'] if node['os'].include?('solaris2')
 end
 
 # log  "####{cookbook_name}::#{recipe_name} #{Time.now.inspect}: Finished execution phase"
diff --git a/fmw_jdk/recipes/rng_service.rb b/fmw_jdk/recipes/rng_service.rb
@@ -17,21 +17,7 @@
 
 package 'rng-tools'
 
-if VERSION.start_with? '11.'
-  ruby_block "loading for chef 11 jdk rng_service" do
-    block do
-      if node['platform_family'] == 'rhel'
-        res = Chef::Resource::Chef::Resource::FmwJdkRngServiceRedhat.new( 'rng service', run_context ) if  node['platform_version'] < '7.0'
-        res = Chef::Resource::Chef::Resource::FmwJdkRngServiceRedhat7.new( 'rng service', run_context ) if node['platform_version'] >= '7.0'
-      else
-        res = Chef::Resource::Chef::Resource::FmwJdkRngServiceDebian.new( 'rng service', run_context )
-      end
-      res.run_action :configure
-    end
-  end
-else
-  fmw_jdk_rng_service 'rng service'
-end
+fmw_jdk_rng_service 'rng service'
 
 # log  "####{cookbook_name}::#{recipe_name} #{Time.now.inspect}: Finished execution phase"
 puts "####{cookbook_name}::#{recipe_name} #{Time.now.inspect}: Finished compile phase"
diff --git a/fmw_jdk/resources/jdk_linux.rb b/fmw_jdk/resources/jdk_linux.rb
@@ -19,7 +19,7 @@
 # Linux JDK source file, it should be a file with .tar.gz as extension.
 attribute :source_file,   kind_of: String, required: true, callbacks:
           {
-            'source should have a valid JDK extension' => ->(extensions) { Chef::Resource::FmwJdkJdkLinux.validate_source_file(extensions) }
+            'source should have a valid JDK extension' => ->(extensions) { Chef::ResourceResolver.resolve(:fmw_jdk_jdk_linux).validate_source_file(extensions) }
           }
 
 state_attrs :java_home_dir
diff --git a/fmw_jdk/resources/jdk_linux_rpm.rb b/fmw_jdk/resources/jdk_linux_rpm.rb
@@ -19,7 +19,7 @@
 # Linux JDK source file, it should be a file with .rpm as extension.
 attribute :source_file,   kind_of: String, required: true, callbacks:
           {
-            'source should have a valid JDK extension' => ->(extensions) { Chef::Resource::FmwJdkJdkLinuxRpm.validate_source_file(extensions) }
+            'source should have a valid JDK extension' => ->(extensions) { Chef::ResourceResolver.resolve(:fmw_jdk_jdk_linux_rpm).validate_source_file(extensions) }
           }
 
 state_attrs :java_home_dir
diff --git a/fmw_jdk/resources/jdk_solaris.rb b/fmw_jdk/resources/jdk_solaris.rb
@@ -19,12 +19,12 @@
 # Solaris JDK source file, it should be a file with .tar.gz as extension.
 attribute :source_file,   kind_of: String, required: true, callbacks:
           {
-            'source should have a valid JDK extension' => ->(extensions) { Chef::Resource::FmwJdkJdkSolaris.validate_source_file(extensions) }
+            'source should have a valid JDK extension' => ->(extensions) { Chef::ResourceResolver.resolve(:fmw_jdk_jdk_solaris).validate_source_file(extensions) }
           }
 # Solaris JDK source x64 file, it should be a file with .tar.gz as extension.
 attribute :source_x64_file,   kind_of: String, required: false, callbacks:
           {
-            'source should have a valid JDK extension' => ->(extensions) { Chef::Resource::FmwJdkJdkSolaris.validate_source_file(extensions) }
+            'source should have a valid JDK extension' => ->(extensions) { Chef::ResourceResolver.resolve(:fmw_jdk_jdk_solaris).validate_source_file(extensions) }
           }
 
 state_attrs :java_home_dir
diff --git a/fmw_jdk/resources/jdk_solaris_z.rb b/fmw_jdk/resources/jdk_solaris_z.rb
@@ -19,12 +19,12 @@
 # Solaris tar.Z JDK source file, it should be a SVR4 package file.
 attribute :source_file,   kind_of: String, required: true, callbacks:
           {
-            'source should have a valid JDK extension' => ->(extensions) { Chef::Resource::FmwJdkJdkSolarisZ.validate_source_file(extensions) }
+            'source should have a valid JDK extension' => ->(extensions) { Chef::ResourceResolver.resolve(:fmw_jdk_jdk_solaris_z).validate_source_file(extensions) }
           }
 # Solaris tar.Z JDK source x64 file, it should be a SVR4 package file.
 attribute :source_x64_file,   kind_of: String, required: false, callbacks:
           {
-            'source should have a valid JDK extension' => ->(extensions) { Chef::Resource::FmwJdkJdkSolarisZ.validate_source_file(extensions) }
+            'source should have a valid JDK extension' => ->(extensions) { Chef::ResourceResolver.resolve(:fmw_jdk_jdk_solaris_z).validate_source_file(extensions) }
           }
 
 state_attrs :java_home_dir
diff --git a/fmw_jdk/resources/jdk_windows.rb b/fmw_jdk/resources/jdk_windows.rb
@@ -17,7 +17,7 @@
 # Windows JDK source executable, it should be a file with .exe as extension.
 attribute :source_file,   kind_of: String, required: true, callbacks:
             {
-              'source should have a valid JDK extension' => ->(extensions) { Chef::Resource::FmwJdkJdkWindows.validate_source_file(extensions) }
+              'source should have a valid JDK extension' => ->(extensions) { Chef::ResourceResolver.resolve(:fmw_jdk_jdk_windows).validate_source_file(extensions) }
             }
 
 state_attrs :java_home_dir
diff --git a/fmw_jdk/test/integration/exe/serverspec/install_spec.rb b/fmw_jdk/test/integration/exe/serverspec/install_spec.rb
@@ -5,11 +5,11 @@
   # Serverspec examples can be found at
   # http://serverspec.org/resource_types.html
 
-  describe file('C:/java/jdk1.8.0_40') do
+  describe file('C:/java/jdk1.8.0_131') do
     it { should be_directory }
   end
 
-  describe file('C:/java/jdk1.8.0_40/bin/java.exe') do
+  describe file('C:/java/jdk1.8.0_131/bin/java.exe') do
     it { should be_file }
   end
 
diff --git a/fmw_jdk/test/integration/rpm/serverspec/install_spec.rb b/fmw_jdk/test/integration/rpm/serverspec/install_spec.rb
@@ -5,12 +5,12 @@
   # Serverspec examples can be found at
   # http://serverspec.org/resource_types.html
 
-  describe file('/usr/java/jdk1.8.0_40') do
+  describe file('/usr/java/jdk1.8.0_131') do
     it { should be_directory }
     it { should be_owned_by 'root' }
   end
 
-  describe file('/usr/java/jdk1.8.0_40/bin/java') do
+  describe file('/usr/java/jdk1.8.0_131/bin/java') do
     it { should be_file }
     it { should be_owned_by 'root' }
     it { should be_executable }
diff --git a/fmw_jdk/test/integration/rpm_7/serverspec/install_spec.rb b/fmw_jdk/test/integration/rpm_7/serverspec/install_spec.rb
@@ -5,12 +5,12 @@
   # Serverspec examples can be found at
   # http://serverspec.org/resource_types.html
 
-  describe file('/usr/java/jdk1.7.0_75') do
+  describe file('/usr/java/jdk1.7.0_79') do
     it { should be_directory }
     it { should be_owned_by 'root' }
   end
 
-  describe file('/usr/java/jdk1.7.0_75/bin/java') do
+  describe file('/usr/java/jdk1.7.0_79/bin/java') do
     it { should be_file }
     it { should be_owned_by 'root' }
     it { should be_executable }
diff --git a/fmw_jdk/test/integration/tar/serverspec/install_spec.rb b/fmw_jdk/test/integration/tar/serverspec/install_spec.rb
diff --git a/fmw_jdk/test/integration/tar_7/serverspec/install_spec.rb b/fmw_jdk/test/integration/tar_7/serverspec/install_spec.rb
diff --git a/fmw_jdk/test/integration/tar_7_sol/serverspec/install_spec.rb b/fmw_jdk/test/integration/tar_7_sol/serverspec/install_spec.rb
diff --git a/fmw_jdk/test/integration/tar_sol/serverspec/install_spec.rb b/fmw_jdk/test/integration/tar_sol/serverspec/install_spec.rb
diff --git a/fmw_wls/.kitchen.yml b/fmw_wls/.kitchen.yml
