diff --git a/fmw_domain/attributes/default.rb b/fmw_domain/attributes/default.rb index 2bbaa8c..dfaaa14 100644 --- a/fmw_domain/attributes/default.rb +++ b/fmw_domain/attributes/default.rb @@ -1,8 +1,9 @@ include_attribute 'fmw_wls' default['fmw_domain']['nodemanager_port'] = 5556 +default['fmw_domain']['nodemanager_service_description'] = nil -if platform_family?('windows') +if node['platform_family'] =='windows' default['fmw_domain']['domains_dir'] = 'C:/oracle/middleware/user_projects/domains' default['fmw_domain']['apps_dir'] = 'C:/oracle/middleware/user_projects/applications' @@ -16,7 +17,7 @@ default['fmw_domain']['apps_dir'] = '/opt/oracle/middleware/user_projects/applications' end -case platform_family +case node['platform_family'] when 'debian', 'rhel' default['fmw']['orainst_dir'] = '/etc' default['fmw']['user_home_dir'] = '/home' diff --git a/fmw_domain/providers/nodemanager_service_windows.rb b/fmw_domain/providers/nodemanager_service_windows.rb index ff3e841..b7890b0 100644 --- a/fmw_domain/providers/nodemanager_service_windows.rb +++ b/fmw_domain/providers/nodemanager_service_windows.rb @@ -23,6 +23,8 @@ def load_current_resource @current_resource.version(@new_resource.version) @current_resource.bin_dir(@new_resource.bin_dir) @current_resource.java_home_dir(@new_resource.java_home_dir) + @current_resource.prod_name(@new_resource.prod_name) + @current_resource.service_description(@new_resource.service_description) @current_resource end @@ -37,9 +39,19 @@ def load_current_resource service_name = nil if new_resource.version == '10.3.6' - service_check_name = 'Oracle WebLogic NodeManager' + if new_resource.prod_name.nil? or new_resource.prod_name == '' + local_prod_name = 'Oracle Weblogic' + else + local_prod_name = new_resource.prod_name + end + service_check_name = '#{local_prod_name} NodeManager' else - service_check_name = "Oracle Weblogic #{new_resource.domain_name} NodeManager" + if new_resource.prod_name.nil? or new_resource.prod_name == '' + local_prod_name = 'Oracle Weblogic #{new_resource.domain_name}' + else + local_prod_name = new_resource.prod_name + end + service_check_name = "#{local_prod_name} NodeManager" end # check the existence and the service name @@ -58,20 +70,30 @@ def load_current_resource end if exists == false + Chef::Log.info("PROD_NAME: " + local_prod_name) if new_resource.version == '10.3.6' execute 'add NodeManager service 11g' do command 'installNodeMgrSvc.cmd' 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 }) + 'JAVA_HOME' => new_resource.java_home_dir, + 'PROD_NAME' => local_prod_name, + 'SERVICE_DESCRIPTION' => new_resource.service_description }) end else + cmd_file_name = ::File.join(new_resource.bin_dir, 'installNodeMgrSvc.cmd') + file_content = ::File.read(cmd_file_name) + file_content = file_content.gsub(/^set PROD_NAME=.*$/, "") + ::File.open(cmd_file_name, "w") {|file| file.puts file_content } + execute 'add NodeManager service 12c' do command 'installNodeMgrSvc.cmd' cwd new_resource.bin_dir environment ({ 'JAVA_OPTIONS' => "-Dohs.product.home=#{new_resource.middleware_home_dir} -Dweblogic.RootDirectory=#{new_resource.domain_dir}", 'JAVA_HOME' => new_resource.java_home_dir, - 'MW_HOME' => new_resource.middleware_home_dir }) + 'MW_HOME' => new_resource.middleware_home_dir, + 'PROD_NAME' => local_prod_name, + 'SERVICE_DESCRIPTION' => new_resource.service_description }) end end # do it in a block so it executed after the adding the nodemanager service diff --git a/fmw_domain/recipes/nodemanager.rb b/fmw_domain/recipes/nodemanager.rb index a9c4c72..99f941e 100644 --- a/fmw_domain/recipes/nodemanager.rb +++ b/fmw_domain/recipes/nodemanager.rb @@ -26,13 +26,21 @@ bin_dir = "#{node['fmw']['weblogic_home_dir']}/server/bin" nodemanager_template = 'nodemanager.properties_11g' nodemanager_check = node['fmw']['weblogic_home_dir'] - script_name = "nodemanager_11g" + if node['fmw']['prod_name'].nil? or node['fmw']['prod_name'] == '' + script_name = "nodemanager_11g" + else + script_name = "#{node['fmw']['prod_name']}_nodemanager_11g" + end else nodemanager_home_dir = "#{node['fmw_domain']['domains_dir']}/#{domain_params['domain_name']}/nodemanager" bin_dir = "#{node['fmw_domain']['domains_dir']}/#{domain_params['domain_name']}/bin" nodemanager_template = 'nodemanager.properties_12c' nodemanager_check = "#{node['fmw_domain']['domains_dir']}/#{domain_params['domain_name']}" - script_name = "nodemanager_#{domain_params['domain_name']}" + if node['fmw']['prod_name'].nil? or node['fmw']['prod_name'] == '' + script_name = "nodemanager_11g" + else + script_name = "#{node['fmw']['prod_name']}_nodemanager_#{domain_params['domain_name']}" + end end nodemanager_log_file = "#{nodemanager_home_dir}/nodemanager.log" @@ -141,6 +149,8 @@ res.middleware_home_dir node['fmw']['middleware_home_dir'] res.bin_dir bin_dir res.java_home_dir node['fmw']['java_home_dir'] + res.prod_name node['fmw']['prod_name'] + res.service_description node['fmw_domain']['nodemanager_service_description'] res.run_action :configure end end @@ -152,6 +162,8 @@ middleware_home_dir node['fmw']['middleware_home_dir'] bin_dir bin_dir java_home_dir node['fmw']['java_home_dir'] + prod_name node['fmw']['prod_name'] + service_description node['fmw_domain']['nodemanager_service_description'] end end diff --git a/fmw_domain/resources/nodemanager_service_windows.rb b/fmw_domain/resources/nodemanager_service_windows.rb index 4f3afb3..deb545d 100644 --- a/fmw_domain/resources/nodemanager_service_windows.rb +++ b/fmw_domain/resources/nodemanager_service_windows.rb @@ -24,3 +24,7 @@ attribute :bin_dir, kind_of: String, required: true # java home path attribute :java_home_dir, kind_of: String, required: true +# prod name for product re-branding +attribute :prod_name, kind_of: String, required: false, default: nil +# service description for product re-branding +attribute :service_description, kind_of: String, required: false, default: nil diff --git a/fmw_wls/attributes/default.rb b/fmw_wls/attributes/default.rb index 457c88e..3a7379d 100644 --- a/fmw_wls/attributes/default.rb +++ b/fmw_wls/attributes/default.rb @@ -1,6 +1,7 @@ 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_wls']['install_type'] = 'wls' # infra or wls +default['fmw']['prod_name'] = nil if platform_family?('windows') default['fmw']['middleware_home_dir'] = 'C:/oracle/middleware'