Merge branch 'master' into added-mft-to-rcu-component-array

oracle · Dec 9, 2016 · 61359ac · 61359ac
2 parents 4dd2d46 + e393f69
commit 61359ac
Show file tree

Hide file tree

Showing 52 changed files with 440 additions and 118 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 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 
+
 ## chef-samples v0.1.2 (12 Jul 2016)
 
 - Support for WebLogic/FMW 12.2.1.1

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

diff --git a/fmw_domain/.kitchen.yml b/fmw_domain/.kitchen.yml
@@ -1,6 +1,7 @@
 ---
 driver:
   name: vagrant
+  provider: vmware_fusion
 
 provisioner:
   name: chef_solo
@@ -12,7 +13,7 @@ platforms:
         memory: 2048
         cpus: 1
       synced_folders:
-        - ["C:/software", "/software"]
+        - ["/Users/edwinbiemond/software", "/software"]
       network:
         - ["private_network", {ip: "10.10.10.135"}]
   - name: oel-7.0
@@ -22,7 +23,7 @@ platforms:
         memory: 2048
         cpus: 1
       synced_folders:
-        - ["C:/software", "/software"]
+        - ["/Users/edwinbiemond/software", "/software"]
       network:
         - ["private_network", {ip: "10.10.10.135"}]
   - name: oel-6.6
@@ -32,7 +33,7 @@ platforms:
         memory: 2048
         cpus: 1
       synced_folders:
-        - ["C:/software", "/software"]
+        - ["/Users/edwinbiemond/software", "/software"]
       network:
         - ["private_network", {ip: "10.10.10.135"}]
   - name: oel-5.8
@@ -42,7 +43,7 @@ platforms:
         memory: 2048
         cpus: 1
       synced_folders:
-        - ["C:/software", "/software"]
+        - ["/Users/edwinbiemond/software", "/software"]
       network:
         - ["private_network", {ip: "10.10.10.135"}]
   - name: windows-2012r2
@@ -54,7 +55,7 @@ platforms:
         memory: 3072
         cpus: 2
       synced_folders:
-        - ["C:/software", "/software"]
+        - ["/Users/edwinbiemond/software", "/software"]
       network:
         - ["private_network", {ip: "10.10.10.135"}]
   - name: windows-8.1
@@ -66,7 +67,7 @@ platforms:
         memory: 3072
         cpus: 2
       synced_folders:
-        - ["C:/software", "/software"]
+        - ["/Users/edwinbiemond/software", "/software"]
       network:
         - ["private_network", {ip: "10.10.10.135"}]
   - name: solaris-10
@@ -76,7 +77,7 @@ platforms:
         memory: 2048
         cpus: 1
       synced_folders:
-        - ["C:/software", "/software"]
+        - ["/Users/edwinbiemond/software", "/software"]
       network:
         - ["private_network", {ip: "10.10.10.135"}]
   - name: solaris-11.2
@@ -86,7 +87,7 @@ platforms:
         memory: 2048
         cpus: 1
       synced_folders:
-        - ["C:/software", "/software"]
+        - ["/Users/edwinbiemond/software", "/software"]
       network:
         - ["private_network", {ip: "10.10.10.135"}]
 
@@ -103,14 +104,14 @@ suites:
       - recipe[fmw_domain::adminserver]
     attributes:
       fmw:
-        java_home_dir:       "/usr/java/jdk1.8.0_40"
+        java_home_dir:       "/usr/java/jdk1.8.0_111"
         middleware_home_dir: "/opt/oracle/middleware_1221"
         weblogic_home_dir:   "/opt/oracle/middleware_1221/wlserver"
-        version:             "12.2.1.1"
+        version:             "12.2.1.2"
       fmw_jdk:
-        source_file:         "/software/jdk-8u40-linux-x64.tar.gz"
+        source_file:         "/software/jdk-8u111-linux-x64.tar.gz"
       fmw_wls:
-        source_file:         "/software/fmw_12.2.1.1.0_wls.jar"
+        source_file:         "/software/fmw_12.2.1.2.0_wls.jar"
       fmw_domain:
         databag_key:                "DEV_WLS1"
         domains_dir:                "/opt/oracle/middleware_1221/user_projects/domains"
@@ -120,6 +121,41 @@ suites:
       - windows-8.1
       - solaris-11.2
       - solaris-10
+
+  - name: wls1221_jrf
+    data_bags_path: "test/integration/data_bags"
+    run_list:
+      - recipe[fmw_jdk::install]
+      - recipe[fmw_jdk::rng_service]
+      - recipe[fmw_wls::setup]
+      - recipe[fmw_wls::install]
+      - recipe[fmw_domain::domain]
+      - recipe[fmw_domain::extension_jrf]
+      - recipe[fmw_domain::nodemanager]
+      - recipe[fmw_domain::adminserver]
+    attributes:
+      fmw:
+        java_home_dir:       "/usr/java/jdk1.8.0_111"
+        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"
+      fmw_wls:
+        source_file:         "/software/fmw_12.2.1.2.0_infrastructure.jar"
+        install_type:        "infra"
+      fmw_domain:
+        databag_key:                "DEV_WLS1"
+        restricted:                 true
+        domains_dir:                "/opt/oracle/middleware_1221/user_projects/domains"
+        apps_dir:                   "/opt/oracle/middleware_1221/user_projects/applications"
+        nodemanager_listen_address: "10.10.10.135"
+    excludes:
+      - windows-2012r2
+      - windows-8.1
+      - solaris-11.2
+      - solaris-10
+
   - name: wls1213
     data_bags_path: "test/integration/data_bags"
     run_list:

diff --git 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 ) 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 ) on any Windows, Linux or Solaris host or VM.
 
 ## Setup
 

diff --git 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'
+    if version == '12.2.1' or version == '12.2.1.1' or version == '12.2.1.2'
       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'
+    if version == '12.2.1' or version == '12.2.1.1' or version == '12.2.1.2'
       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
@@ -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.2'
+version          '0.1.3'
 
 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
@@ -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.1.3', '12.1.2'].include?(node['fmw']['version'])
+if ['12.2.1', '12.2.1.1', '12.2.1.2', '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
@@ -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.1.3', '12.1.2'].include?(node['fmw']['version'])
+if ['12.2.1', '12.2.1.1', '12.2.1.2', '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
@@ -44,7 +44,7 @@
   bam_cluster = ''
 end
 
-if ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(node['fmw']['version'])
+if ['12.2.1', '12.2.1.1', '12.2.1.2', '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
@@ -21,7 +21,7 @@
 
 restricted = false
 
-if ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(node['fmw']['version'])
+if ['12.2.1', '12.2.1.1', '12.2.1.2', '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
@@ -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.1.3', '12.1.2'].include?(node['fmw']['version'])
+if ['12.2.1', '12.2.1.1', '12.2.1.2', '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
@@ -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.1.3', '12.1.2'].include?(node['fmw']['version'])
+if ['12.2.1', '12.2.1.1', '12.2.1.2', '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
@@ -21,7 +21,7 @@
 
 restricted = false
 
-if ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(node['fmw']['version'])
+if ['12.2.1', '12.2.1.1', '12.2.1.2', '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
@@ -114,7 +114,7 @@
     serverGroup = ["BAM12-MGD-SVRS"]
     if BAM_CLUSTER:
 
-      if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1']:
+      if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']:
         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']:
+      if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']:
         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
@@ -109,7 +109,7 @@
 
     serverGroup = ["OSB-MGD-SVRS-COMBINED"]
     if OSB_CLUSTER:
-      if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1']:
+      if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']:
         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']:
+      if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']:
         updateDomain()
         dumpStack()
 

diff --git 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']:
+      if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']:
         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']:
+      if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']:
         updateDomain()
         dumpStack()
 

diff --git a/fmw_domain/test/integration/wls1221/serverspec/install_spec.rb b/fmw_domain/test/integration/wls1221/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_111') 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_111/bin/java') do
     it { should be_file }
     it { should be_owned_by 'root' }
     it { should be_executable }

diff --git a/fmw_domain/test/integration/wls1221_jrf/serverspec/default_spec.rb b/fmw_domain/test/integration/wls1221_jrf/serverspec/default_spec.rb
@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe 'fmw_wls::default' do
+
+  # Serverspec examples can be found at
+  # http://serverspec.org/resource_types.html
+
+  # it 'does something' do
+  #   skip 'Replace this with meaningful tests'
+  # end
+
+end