Skip to content

Commit

Permalink
Merge pull request #569 from thiagomarinho/puppet4
Browse files Browse the repository at this point in the history
Remove "wls_apps_inside_domain" and "crossdomain_enabled" variables from domain template default variables
  • Loading branch information
biemond authored Sep 5, 2019
2 parents 780be66 + 5de1b49 commit aac7ebd
Showing 1 changed file with 51 additions and 40 deletions.
91 changes: 51 additions & 40 deletions manifests/domain.pp
Original file line number Diff line number Diff line change
Expand Up @@ -594,50 +594,61 @@
}
}

$default_domain_template_variables = {
'domain_name' => $domain_name,
'domain_dir' => $domain_dir,
'version' => $version,
'templateOHS' => $templateOHS,
'template' => $template,
'templateCoherence' => $templateCoherence,
'nodemanager_username' => $nodemanager_username,
'nodemanager_password' => $nodemanager_password,
'adminserver_address' => $adminserver_address,
'adminserver_port' => $adminserver_port,
'ohs_standalone_listen_address' => $ohs_standalone_listen_address,
'ohs_standalone_listen_port' => $ohs_standalone_listen_port,
'ohs_standalone_ssl_listen_port' => $ohs_standalone_ssl_listen_port,
'download_dir' => $download_dir,
'weblogic_home_dir' => $weblogic_home_dir,
'apps_dir' => $apps_dir,
'jsse_enabled' => $jsse_enabled,
'development_mode' => $development_mode,
'adminserver_name' => $adminserver_name,
'weblogic_user' => $weblogic_user,
'weblogic_password' => $weblogic_password,
'jdk_home_dir' => $jdk_home_dir,
'domain_password' => $domain_password,
'adminserver_listen_on_all_interfaces' => $adminserver_listen_on_all_interfaces,
'nodemanager_secure_listener' => $nodemanager_secure_listener,
'create_default_coherence_cluster' => $create_default_coherence_cluster,
'java_arguments' => $java_arguments,
'admin_nodemanager_log_dir' => $admin_nodemanager_log_dir,
'adminserver_machine_name' => $adminserver_machine_name,
'adminserver_ssl_port' => $adminserver_ssl_port,
'custom_identity' => $custom_identity,
'custom_identity_keystore_filename' => $custom_identity_keystore_filename,
'custom_identity_keystore_passphrase' => $custom_identity_keystore_passphrase,
'trust_keystore_file' => $trust_keystore_file,
'trust_keystore_passphrase' => $trust_keystore_passphrase,
'custom_identity_alias' => $custom_identity_alias,
'custom_identity_privatekey_passphrase' => $custom_identity_privatekey_passphrase
}

# OHS Standalone template does not use wls_apps_inside_domain and crossdomain_enabled variables
$domain_template_variables = $domain_template ? {
'ohs_standalone' => $default_domain_template_variables,

default => merge($default_domain_template_variables, {
'wls_apps_inside_domain' => $wls_apps_inside_domain,
'crossdomain_enabled' => $crossdomain_enabled
}),
}

# the domain.py used by the wlst
file { "domain.py ${domain_name} ${title}":
ensure => present,
path => "${download_dir}/domain_${domain_name}.py",
content => epp($templateFile, {
'domain_name' => $domain_name,
'domain_dir' => $domain_dir,
'version' => $version,
'templateOHS' => $templateOHS,
'template' => $template,
'templateCoherence' => $templateCoherence,
'nodemanager_username' => $nodemanager_username,
'nodemanager_password' => $nodemanager_password,
'adminserver_address' => $adminserver_address,
'adminserver_port' => $adminserver_port,
'ohs_standalone_listen_address' => $ohs_standalone_listen_address,
'ohs_standalone_listen_port' => $ohs_standalone_listen_port,
'ohs_standalone_ssl_listen_port' => $ohs_standalone_ssl_listen_port,
'download_dir' => $download_dir,
'weblogic_home_dir' => $weblogic_home_dir,
'apps_dir' => $apps_dir,
'jsse_enabled' => $jsse_enabled,
'development_mode' => $development_mode,
'adminserver_name' => $adminserver_name,
'weblogic_user' => $weblogic_user,
'weblogic_password' => $weblogic_password,
'jdk_home_dir' => $jdk_home_dir,
'domain_password' => $domain_password,
'adminserver_listen_on_all_interfaces' => $adminserver_listen_on_all_interfaces,
'nodemanager_secure_listener' => $nodemanager_secure_listener,
'create_default_coherence_cluster' => $create_default_coherence_cluster,
'java_arguments' => $java_arguments,
'admin_nodemanager_log_dir' => $admin_nodemanager_log_dir,
'adminserver_machine_name' => $adminserver_machine_name,
'adminserver_ssl_port' => $adminserver_ssl_port,
'custom_identity' => $custom_identity,
'custom_identity_keystore_filename' => $custom_identity_keystore_filename,
'custom_identity_keystore_passphrase' => $custom_identity_keystore_passphrase,
'trust_keystore_file' => $trust_keystore_file,
'trust_keystore_passphrase' => $trust_keystore_passphrase,
'custom_identity_alias' => $custom_identity_alias,
'custom_identity_privatekey_passphrase' => $custom_identity_privatekey_passphrase,
'wls_apps_inside_domain' => $wls_apps_inside_domain,
'crossdomain_enabled' => $crossdomain_enabled }),
content => epp($templateFile, $domain_template_variables),
replace => true,
backup => false,
mode => lookup('orawls::permissions'),
Expand Down

0 comments on commit aac7ebd

Please sign in to comment.