Merge pull request #7 from madhusudhanan-mohan/fcubs_max_stuckthreati…

…me_best_practices

Fcubs max stuckthreatime best practices - Added a null check for serverfailuretriggerbean and additional JVM Args for SSL Fix

files/providers/wls_server/create.py.erb

@@ -207,7 +207,14 @@ try:
     #FCUBS improvement
     print("Creating the OverloadProtection Bean CREATE!!!!")
     cd('/Servers/'+name+'/OverloadProtection/'+name)
-    cmo.createServerFailureTrigger()
+    server_failure_trigger_mbean = cmo.getServerFailureTrigger()
+    if server_failure_trigger_mbean:
+        print("ServerFailureTrigger has been already created")
+    else:
+        print("Creating the server failure trigger bean")
+        cmo.createServerFailureTrigger()
+        print("CREATED THE ServerFailureTrigger")
+
     print("CREATED THE ServerFailureTrigger")
     cd('/Servers/'+name+'/OverloadProtection/'+name+'/ServerFailureTrigger/'+name)
     set_attribute_value('MaxStuckThreadTime', max_stuck_thread_time, use_default_value_when_empty)

files/providers/wls_server/modify.py.erb

@@ -240,7 +240,14 @@ try:
     # Added for the FCUBS best practices
     print("Creating the OverloadProtection Bean Inside Modify!!!!")
     cd('/Servers/'+name+'/OverloadProtection/'+name)
-    cmo.createServerFailureTrigger()
+    server_failure_trigger_mbean = cmo.getServerFailureTrigger()
+    if server_failure_trigger_mbean:
+        print("ServerFailureTrigger has been already created")
+    else:
+        print("Creating the server failure trigger bean")
+        cmo.createServerFailureTrigger()
+        print("CREATED THE ServerFailureTrigger")
+
     cd('/Servers/'+name+'/OverloadProtection/'+name+'/ServerFailureTrigger/'+name)
     set_attribute_value('MaxStuckThreadTime', max_stuck_thread_time, use_default_value_when_empty)
 

manifests/copydomain.pp

@@ -256,7 +256,8 @@
     }
 
     if $custom_trust == true {
-      $config = "-Dweblogic.ssl.JSSEEnabled=${jsse_enabled} -Dweblogic.security.SSL.enableJSSE=${jsse_enabled} -Dweblogic.security.TrustKeyStore=CustomTrust -Dweblogic.security.CustomTrustKeyStoreFileName=${trust_keystore_file} -Dweblogic.security.CustomTrustKeystorePassPhrase=${trust_keystore_passphrase} ${extra_arguments}"
+      #Added the JVM params for enabling SSL configurations
+      $config = "-Dweblogic.ssl.JSSEEnabled=${jsse_enabled} -Dweblogic.security.SSL.enableJSSE=${jsse_enabled} -Dweblogic.security.TrustKeyStore=CustomTrust -Dweblogic.security.CustomTrustKeyStoreFileName=${trust_keystore_file} -Dweblogic.security.CustomTrustKeystorePassPhrase=${trust_keystore_passphrase} -Dweblogic.security.SSL.ignoreHostnameVerification=true -Dweblogic.security.CustomTrustKeyStoreType=JKS ${extra_arguments}"
       if ($version == 1212 or $version == 1213 or $version >= 1221) {
         # remove nodemanager.properties, else it won't be updated by nodemanager
         exec { "rm ${domains_dir}/${domain_name}/nodemanager/nodemanager.properties":
@@ -271,7 +272,6 @@
     else {
       $config = "-Dweblogic.ssl.JSSEEnabled=${jsse_enabled} -Dweblogic.security.SSL.enableJSSE=${jsse_enabled} ${extra_arguments}"
     }
-
     exec { "execwlst ${domain_name} ${title}":
       command     => "${wlst_dir} ${download_dir}/enroll_domain_${domain_name}.py \'${weblogic_password}\'",
       environment => ["JAVA_HOME=${jdk_home_dir}", "CONFIG_JVM_ARGS=${config}"],

templates/fmw_silent_odi.rsp.epp

@@ -33,10 +33,10 @@ SOFTWARE_UPDATES_PROXY_USER=
 SOFTWARE_UPDATES_PROXY_PASSWORD=
 
 #The oracle home location. This can be an existing Oracle Home or a new Oracle Home
-ORACLE_HOME=<% $middleware_home_dir %>
+ORACLE_HOME=<%= $middleware_home_dir %>
 
 #Set this variable value to the Installation Type selected. e.g. Fusion Middleware Infrastructure, Fusion Middleware Infrastructure With Examples.
-INSTALL_TYPE=<% $install_type %>
+INSTALL_TYPE=<%= $install_type %>
 
 #Provide the My Oracle Support Username. If you wish to ignore Oracle Configuration Manager configuration provide empty string for user name.
 MYORACLESUPPORT_USERNAME=