support chef 13 & nodemanager naming fixes for windows and linux

Author: Edwin Biemond

README.md

@@ -1,7 +1,7 @@
 # Oracle WebLogic CHEF cookbooks
 
 ## Chef support
-- Version 12, 13 ( for use v0.1.3 release for chef 11)
+- Version 12, 13 ( use v0.1.3 release for chef 11 support)
 - Chef solo, client/server
 - Databags (encrypted)
 

fmw_bsu/.kitchen.yml

@@ -15,15 +15,15 @@ platforms:
         - ["C:/software", "/software"]
   - name: oel-7.0
     driver_config:
-      box: OEL-7.0_BS-x86_64
+      box: OEL7_2-x86_64
       customize:
         memory: 2048
         cpus: 1
       synced_folders:
         - ["C:/software", "/software"]
   - name: oel-6.6
     driver_config:
-      box: OEL-6.6
+      box: OEL6_6-x86_64_plain
       customize:
         memory: 2048
         cpus: 1
@@ -68,11 +68,11 @@ suites:
       - recipe[fmw_bsu::weblogic]
     attributes:
       fmw:
-        java_home_dir:       "/usr/java/jdk1.7.0_75"
+        java_home_dir:       "/usr/java/jdk1.7.0_79"
         middleware_home_dir: "/opt/oracle/middleware_1036"
         version:             "10.3.6"
       fmw_jdk:
-        source_file:         "/software/jdk-7u75-linux-x64.tar.gz"
+        source_file:         "/software/jdk-7u79-linux-x64.tar.gz"
       fmw_wls:
         source_file:         "/software/wls1036_generic.jar"
       fmw_bsu:
@@ -88,12 +88,12 @@ suites:
       - recipe[fmw_bsu::weblogic]
     attributes:
       fmw:
-        java_home_dir:           "c:\\java\\jdk1.7.0_75"
+        java_home_dir:           "c:\\java\\jdk1.7.0_79"
         middleware_home_dir:     "c:\\oracle\\middleware_1036"
         version:                 "10.3.6"
         tmp_dir:                 "C:\\Users\\vagrant\\AppData\\Local\\temp"
       fmw_jdk:
-        source_file:             "c:\\software\\jdk-7u75-windows-x64.exe"
+        source_file:             "c:\\software\\jdk-7u79-windows-x64.exe"
       fmw_wls:
         source_file:             "c:\\software\\wls1036_generic.jar"
       fmw_bsu:

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.3'
+version          '0.1.4'
 
 recipe            "fmw_bsu",
                   "This is an empty recipe and does not do anything"

fmw_bsu/providers/bsu.rb

@@ -16,7 +16,7 @@ def whyrun_supported?
 
 def load_current_resource
   Chef::Log.info('bsu provider, bsu load current resource')
-  @current_resource ||= Chef::Resource::FmwBsuBsu.new(new_resource.name)
+  @current_resource ||= Chef::ResourceResolver.resolve('fmw_bsu_bsu').new(new_resource.name)
   @current_resource.patch_id(@new_resource.patch_id)
   @current_resource.middleware_home_dir(@new_resource.middleware_home_dir)
   @current_resource.os_user(@new_resource.os_user)

fmw_bsu/providers/bsu_windows.rb

@@ -16,7 +16,7 @@ def whyrun_supported?
 
 def load_current_resource
   Chef::Log.info('bsu provider, bsu load current resource')
-  @current_resource ||= Chef::Resource::FmwBsuBsuWindows.new(new_resource.name)
+  @current_resource ||= Chef::ResourceResolver.resolve('fmw_bsu_bsu_windows').new(new_resource.name)
   @current_resource.patch_id(@new_resource.patch_id)
   @current_resource.middleware_home_dir(@new_resource.middleware_home_dir)
 

fmw_bsu/recipes/weblogic.rb

@@ -64,27 +64,11 @@
 
 end
 
-if VERSION.start_with? '11.'
-  ruby_block "loading for chef 11 bsu install" do
-    block do
-      if node['os'].include?('windows')
-        res = Chef::Resource::Chef::Resource::FmwBsuBsuWindows.new( node['fmw_bsu']['patch_id'], run_context )
-      else
-        res = Chef::Resource::Chef::Resource::FmwBsuBsu.new( node['fmw_bsu']['patch_id'], run_context )
-      end
-      res.patch_id            node['fmw_bsu']['patch_id']
-      res.middleware_home_dir node['fmw']['middleware_home_dir']
-      res.os_user             node['fmw']['os_user'] if ['solaris2', 'linux'].include?(node['os'])
-      res.run_action          :install
-    end
-  end
-else
-  fmw_bsu_bsu node['fmw_bsu']['patch_id'] do
-    action :install
-    patch_id node['fmw_bsu']['patch_id']
-    middleware_home_dir node['fmw']['middleware_home_dir']
-    os_user node['fmw']['os_user'] if ['solaris2', 'linux'].include?(node['os'])
-  end
+fmw_bsu_bsu node['fmw_bsu']['patch_id'] do
+  action :install
+  patch_id node['fmw_bsu']['patch_id']
+  middleware_home_dir node['fmw']['middleware_home_dir']
+  os_user node['fmw']['os_user'] if ['solaris2', 'linux'].include?(node['os'])
 end
 
 # log  "####{cookbook_name}::#{recipe_name} #{Time.now.inspect}: Finished execution phase"

fmw_bsu/test/integration/wls1036/serverspec/weblogic_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 }

fmw_bsu/test/integration/wls1036_win/serverspec/weblogic_spec.rb

@@ -5,11 +5,11 @@
   # Serverspec examples can be found at
   # http://serverspec.org/resource_types.html
 
-  describe file('c:\\java\\jdk1.7.0_75') do
+  describe file('c:\\java\\jdk1.7.0_79') do
     it { should be_directory }
   end
 
-  describe file('c:\\java\\jdk1.7.0_75\\bin\\java.exe') do
+  describe file('c:\\java\\jdk1.7.0_79\\bin\\java.exe') do
     it { should be_file }
   end
 

fmw_domain/.kitchen.yml

@@ -1,7 +1,7 @@
 ---
 driver:
   name: vagrant
-  provider: vmware_fusion
+  # provider: vmware_fusion
 
 provisioner:
   name: chef_solo
@@ -18,22 +18,22 @@ platforms:
         - ["private_network", {ip: "10.10.10.135"}]
   - 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"]
       network:
         - ["private_network", {ip: "10.10.10.135"}]
   - name: oel-6.6
     driver_config:
-      box: OEL-6.6
+      box: OEL6_6-x86_64_plain
       customize:
         memory: 2048
         cpus: 1
       synced_folders:
-        - ["/Users/edwinbiemond/software", "/software"]
+        - ["C:/software", "/software"]
       network:
         - ["private_network", {ip: "10.10.10.135"}]
   - name: oel-5.8
@@ -55,7 +55,7 @@ platforms:
         memory: 3072
         cpus: 2
       synced_folders:
-        - ["/Users/edwinbiemond/software", "/software"]
+        - ["C:/software", "/software"]
       network:
         - ["private_network", {ip: "10.10.10.135"}]
   - name: windows-8.1
@@ -104,12 +104,12 @@ suites:
       - recipe[fmw_domain::adminserver]
     attributes:
       fmw:
-        java_home_dir:       "/usr/java/jdk1.8.0_111"
+        java_home_dir:       "/usr/java/jdk1.8.0_131"
         middleware_home_dir: "/opt/oracle/middleware_1221"
         weblogic_home_dir:   "/opt/oracle/middleware_1221/wlserver"
         version:             "12.2.1.2"
       fmw_jdk:
-        source_file:         "/software/jdk-8u111-linux-x64.tar.gz"
+        source_file:         "/software/jdk-8u131-linux-x64.tar.gz"
       fmw_wls:
         source_file:         "/software/fmw_12.2.1.2.0_wls.jar"
       fmw_domain:
@@ -135,12 +135,12 @@ suites:
       - recipe[fmw_domain::adminserver]
     attributes:
       fmw:
-        java_home_dir:       "/usr/java/jdk1.8.0_111"
+        java_home_dir:       "/usr/java/jdk1.8.0_131"
         middleware_home_dir: "/opt/oracle/middleware_1221"
         weblogic_home_dir:   "/opt/oracle/middleware_1221/wlserver"
         version:             "12.2.1.2"
       fmw_jdk:
-        source_file:         "/software/jdk-8u111-linux-x64.tar.gz"
+        source_file:         "/software/jdk-8u131-linux-x64.tar.gz"
       fmw_wls:
         source_file:         "/software/fmw_12.2.1.2.0_infrastructure.jar"
         install_type:        "infra"
@@ -168,11 +168,11 @@ suites:
       - recipe[fmw_domain::adminserver]
     attributes:
       fmw:
-        java_home_dir:       "/usr/java/jdk1.8.0_40"
+        java_home_dir:       "/usr/java/jdk1.8.0_131"
         middleware_home_dir: "/opt/oracle/middleware_1213"
         weblogic_home_dir:   "/opt/oracle/middleware_1213/wlserver"
       fmw_jdk:
-        source_file:         "/software/jdk-8u40-linux-x64.tar.gz"
+        source_file:         "/software/jdk-8u131-linux-x64.tar.gz"
       fmw_wls:
         source_file:         "/software/fmw_12.1.3.0.0_wls.jar"
       fmw_domain:
@@ -229,11 +229,11 @@ suites:
       # - recipe[fmw_domain::adminserver]
     attributes:
       fmw:
-        java_home_dir:       "/usr/jdk/instances/jdk1.8.0_40"
+        java_home_dir:       "/usr/jdk/instances/jdk1.8.0_131"
         middleware_home_dir: "/opt/oracle/middleware_1213"
         weblogic_home_dir:   "/opt/oracle/middleware_1213/wlserver"
       fmw_jdk:
-        source_file:         "/software/jdk-8u40-solaris-x64.tar.gz"
+        source_file:         "/software/jdk-8u131-solaris-x64.tar.gz"
       fmw_wls:
         source_file:         "/software/fmw_12.1.3.0.0_wls.jar"
       fmw_domain:
@@ -291,12 +291,12 @@ suites:
       - recipe[fmw_domain::adminserver]
     attributes:
       fmw:
-        java_home_dir:       "c:\\java\\jdk1.8.0_40"
+        java_home_dir:       "c:\\java\\jdk1.8.0_131"
         middleware_home_dir: "c:\\oracle\\middleware_1213"
         weblogic_home_dir:   "c:\\oracle\\middleware_1213\\wlserver"
         tmp_dir:             "C:\\Users\\vagrant\\AppData\\Local\\temp"
       fmw_jdk:
-        source_file:         "c:\\software\\jdk-8u40-windows-x64.exe"
+        source_file:         "c:\\software\\jdk-8u131-windows-x64.exe"
       fmw_wls:
         source_file:         "c:\\software\\fmw_12.1.3.0.0_wls.jar"
       fmw_domain:
@@ -357,11 +357,11 @@ suites:
       - recipe[fmw_domain::adminserver]
     attributes:
       fmw:
-        java_home_dir:       "/usr/java/jdk1.7.0_75"
+        java_home_dir:       "/usr/java/jdk1.7.0_79"
         middleware_home_dir: "/opt/oracle/middleware_1213"
         weblogic_home_dir:   "/opt/oracle/middleware_1213/wlserver"
       fmw_jdk:
-        source_file:         "/software/jdk-7u75-linux-x64.tar.gz"
+        source_file:         "/software/jdk-7u79-linux-x64.tar.gz"
       fmw_wls:
         source_file:         "/software/fmw_12.1.3.0.0_infrastructure.jar"
         install_type:        "infra"
@@ -387,12 +387,12 @@ suites:
       - recipe[fmw_domain::adminserver]
     attributes:
       fmw:
-        java_home_dir:       "/usr/java/jdk1.7.0_75"
+        java_home_dir:       "/usr/java/jdk1.7.0_79"
         middleware_home_dir: "/opt/oracle/middleware_1036"
         weblogic_home_dir:   "/opt/oracle/middleware_1036/wlserver_10.3"
         version:             "10.3.6"
       fmw_jdk:
-        source_file:         "/software/jdk-7u75-linux-x64.tar.gz"
+        source_file:         "/software/jdk-7u79-linux-x64.tar.gz"
       fmw_wls:
         source_file:         "/software/wls1036_generic.jar"
       fmw_domain:

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.3'
+version          '0.1.4'
 
 recipe            "fmw_domain",
                   "This is an empty recipe and does not do anything"