Skip to content
This repository was archived by the owner on Aug 29, 2018. It is now read-only.

Commit e215acc

Browse files
detiberdetiber
committed
Address issues with variable interpolation within parameters for init.pp
- addresses #300
1 parent 0fba01c commit e215acc

26 files changed

+139
-102
lines changed

‎manifests/cartridges.pp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
ensure => present,
1919
}
2020

21-
openshift_origin::openshift_cartridge { $::openshift_origin::install_cartridges: }
21+
openshift_origin::openshift_cartridge { $::openshift_origin::cartridges_to_install: }
2222

23-
$recommended_deps = prefix($::openshift_origin::install_cartridges_recommended_deps, 'openshift-origin-cartridge-dependencies-recommended-')
23+
$recommended_deps = prefix($::openshift_origin::cartridge_deps_to_install, 'openshift-origin-cartridge-dependencies-recommended-')
2424
package { $recommended_deps:
2525
ensure => present,
2626
}

‎manifests/client_tools.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222

2323
file { '/etc/openshift/express.conf':
24-
content => inline_template("libra_server = '${openshift_origin::broker_hostname}'"),
24+
content => inline_template("libra_server = '${openshift_origin::broker_fqdn}'"),
2525
owner => 'root',
2626
group => 'root',
2727
mode => '0644',

‎manifests/httpd_certificate.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
$cert_requires = Package['httpd']
2323
}
2424
else {
25-
$cert_domain = $::openshift_origin::broker_hostname
25+
$cert_domain = $::openshift_origin::broker_fqdn
2626
$cert_requires = Package['openshift-origin-broker']
2727
}
2828

‎manifests/init.pp‎

Lines changed: 95 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -757,10 +757,7 @@
757757
$roles = ['broker','node','msgserver','datastore','nameserver'],
758758
$install_method = 'yum',
759759
$parallel_deployment = false,
760-
$repos_base = $::operatingsystem ? {
761-
'Fedora' => 'https://mirror.openshift.com/pub/origin-server/nightly/fedora-19',
762-
default => 'https://mirror.openshift.com/pub/origin-server/nightly/rhel-6',
763-
},
760+
$repos_base = $openshift_origin::params::repos_base,
764761
$architecture = undef,
765762
$override_install_repo = undef,
766763
$os_repo = undef,
@@ -777,26 +774,11 @@
777774
$dns_infrastructure_key = '',
778775
$dns_infrastructure_key_algorithm = 'HMAC-MD5',
779776
$dns_infrastructure_names = [],
780-
$broker_hostname = $dns_infrastructure_zone ? {
781-
'' => "broker.${domain}",
782-
default => "broker.${dns_infrastructure_zone}",
783-
},
784-
$node_hostname = $dns_infrastructure_zone ? {
785-
'' => "node.${domain}",
786-
default => "node.${dns_infrastructure_zone}",
787-
},
788-
$nameserver_hostname = $dns_infrastructure_zone ? {
789-
'' => "ns1.${domain}",
790-
default => "ns1.${dns_infrastructure_zone}",
791-
},
792-
$msgserver_hostname = $dns_infrastructure_zone ? {
793-
'' => "msgserver.${domain}",
794-
default => "msgserver.${dns_infrastructure_zone}",
795-
},
796-
$datastore_hostname = $dns_infrastructure_zone ? {
797-
'' => "mongodb.${domain}",
798-
default => "mongodb.${dns_infrastructure_zone}",
799-
},
777+
$broker_hostname = '',
778+
$node_hostname = '',
779+
$nameserver_hostname = '',
780+
$msgserver_hostname = '',
781+
$datastore_hostname = '',
800782
$datastore1_ip_addr = undef,
801783
$datastore2_ip_addr = undef,
802784
$datastore3_ip_addr = undef,
@@ -808,10 +790,7 @@
808790
$broker_cluster_members = undef,
809791
$broker_cluster_ip_addresses = undef,
810792
$broker_virtual_ip_address = undef,
811-
$broker_virtual_hostname = $dns_infrastructure_zone ? {
812-
'' => "broker.${domain}",
813-
default => "broker.${dns_infrastructure_zone}",
814-
},
793+
$broker_virtual_hostname = '',
815794
$load_balancer_master = false,
816795
$load_balancer_auth_password = 'changeme',
817796
$node_ip_addr = $::ipaddress,
@@ -839,7 +818,7 @@
839818
$ntp_servers = ['time.apple.com iburst', 'pool.ntp.org iburst', 'clock.redhat.com iburst'],
840819
$msgserver_cluster = false,
841820
$msgserver_cluster_members = undef,
842-
$mcollective_cluster_members = $msgserver_cluster_members,
821+
$mcollective_cluster_members = undef,
843822
$msgserver_password = 'changeme',
844823
$msgserver_admin_password = inline_template('<%= require "securerandom"; SecureRandom.base64 %>'),
845824
$mcollective_user = 'mcollective',
@@ -863,14 +842,8 @@
863842
$conf_broker_auth_private_key = undef,
864843
$conf_broker_session_secret = undef,
865844
$conf_broker_multi_haproxy_per_node = false,
866-
$conf_console_product_logo = $ose_version ? {
867-
undef => '/assets/logo-origin.svg',
868-
default => '/assets/logo-enterprise-horizontal.svg',
869-
},
870-
$conf_console_product_title = $ose_version ? {
871-
undef => 'OpenShift Origin',
872-
default => 'OpenShift Enterprise',
873-
},
845+
$conf_console_product_logo = undef,
846+
$conf_console_product_title = undef,
874847
$conf_console_session_secret = undef,
875848
$conf_valid_gear_sizes = ['small'],
876849
$conf_default_gear_capabilities = ['small'],
@@ -885,8 +858,8 @@
885858
$broker_ldap_uri = '',
886859
$broker_ldap_bind_dn = '',
887860
$broker_ldap_bind_password = '',
888-
$node_shmmax = undef,
889-
$node_shmall = undef,
861+
$node_shmmax = $openshift_origin::params::node_shmmax,
862+
$node_shmall = $openshift_origin::params::node_shmall,
890863
$node_container_plugin = 'selinux',
891864
$node_frontend_plugins = ['apache-vhost','nodejs-websocket'],
892865
$node_unmanaged_users = [],
@@ -906,29 +879,98 @@
906879
$install_login_shell = false,
907880
$register_host_with_nameserver = false,
908881
$update_network_conf_files = true,
909-
$install_cartridges = $ose_version ? {
910-
undef => ['10gen-mms-agent','cron','diy','haproxy','mongodb','nodejs',
911-
'perl','php','phpmyadmin','postgresql','python','ruby',
912-
'jenkins','jenkins-client','mysql',],
913-
default => ['cron','diy','haproxy','mongodb','nodejs','perl','php',
914-
'postgresql','python','ruby','jenkins','jenkins-client',
915-
'jbossews','mysql'],
916-
},
917-
$install_cartridges_recommended_deps = $ose_version ? {
918-
undef => ['diy','nodejs','perl','php','python','ruby'],
919-
default => ['jbossews','nodejs','perl','php','python','ruby'],
920-
},
882+
$install_cartridges = undef,
883+
$install_cartridges_recommended_deps = undef,
921884
$install_cartridges_optional_deps = undef,
922885
$manage_firewall = true,
923-
){
886+
) inherits openshift_origin::params {
924887
include openshift_origin::role
925888

889+
$default_host_domain = $dns_infrastructure_zone ? {
890+
'' => $domain,
891+
default => $dns_infrastructure_zone,
892+
}
893+
894+
$broker_fqdn = $broker_hostname ? {
895+
'' => "broker.${default_host_domain}",
896+
default => $broker_hostname,
897+
}
898+
899+
$broker_virtual_fqdn = $broker_virtual_hostname ? {
900+
'' => "broker.${default_host_domain}",
901+
default => $broker_virtual_hostname,
902+
}
903+
904+
$node_fqdn = $node_hostname ? {
905+
'' => "node.${default_host_domain}",
906+
default => $node_hostname,
907+
}
908+
909+
$nameserver_fqdn = $nameserver_hostname ? {
910+
'' => "ns1.${default_host_domain}",
911+
default => $nameserver_hostname,
912+
}
913+
914+
$msgserver_fqdn = $msgserver_hostname ? {
915+
'' => "msgserver.${default_host_domain}",
916+
default => $msgserver_hostname,
917+
}
918+
919+
$datastore_fqdn = $datastore_hostname ? {
920+
'' => "mongodb.${default_host_domain}",
921+
default => $datastore_hostname,
922+
}
923+
924+
# set defaults that are origin/enterprise specific
925+
case $ose_version {
926+
undef: {
927+
$console_product_logo_default = '/assets/logo-origin.svg'
928+
$console_product_title_default = 'OpenShift Origin'
929+
$cartridges_to_install_default = ['10gen-mms-agent','cron','diy','haproxy','mongodb','nodejs',
930+
'perl','php','phpmyadmin','postgresql','python','ruby',
931+
'jenkins','jenkins-client','mysql',]
932+
$cartridge_deps_to_install_default = ['diy','nodejs','perl','php','python','ruby']
933+
}
934+
default: {
935+
$console_product_logo_default = '/assets/logo-enterprise-horizontal.svg'
936+
$console_product_title_default = 'OpenShift Enterprise'
937+
$cartridges_to_install_default = ['cron','diy','haproxy','mongodb','nodejs','perl','php',
938+
'postgresql','python','ruby','jenkins','jenkins-client',
939+
'jbossews','mysql']
940+
$cartridge_deps_to_install_default = ['jbossews','nodejs','perl','php','python','ruby']
941+
}
942+
}
943+
944+
$console_product_logo = $conf_console_product_logo ? {
945+
undef => $console_product_logo_default,
946+
default => $conf_console_product_logo,
947+
}
948+
949+
$console_product_title = $conf_console_product_title ? {
950+
undef => $console_product_title_default,
951+
default => $conf_console_product_title,
952+
}
953+
954+
$cartridges_to_install = $install_cartridges ? {
955+
undef => $cartridges_to_install_default,
956+
default => $install_cartridges,
957+
}
958+
959+
$cartridge_deps_to_install = $install_cartridges_recommended_deps ? {
960+
undef => $cartridge_deps_to_install_default,
961+
default => $install_cartridges_recommended_deps,
962+
}
963+
926964
# Check for various unsupported OSE configs
927965
if $ose_version != undef {
928966
class { 'openshift_origin::ose_supported_config': }
929967
}
930968

931-
if $msgserver_cluster and ! $msgserver_cluster_members and ! $mcollective_cluster_members {
969+
if $msgserver_cluster_members and $mcollective_cluster_members == undef {
970+
$real_mcollective_cluster_members = $msgserver_cluster_members
971+
}
972+
973+
if $msgserver_cluster and ! $msgserver_cluster_members and ! $real_mcollective_cluster_members {
932974
fail('msgserver_cluster_members and mcollective_cluster_members parameters are required when msgserver_cluster is set')
933975
}
934976

‎manifests/mcollective_client.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
# TODO: Replace with MCollective puppet module call
2525

26-
$cluster_members = $::openshift_origin::mcollective_cluster_members
26+
$cluster_members = $::openshift_origin::real_mcollective_cluster_members
2727

2828
if $cluster_members {
2929
$pool_size = size($cluster_members)

‎manifests/mcollective_server.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
require => Class['openshift_origin::install_method'],
2222
}
2323

24-
$cluster_members = $::openshift_origin::mcollective_cluster_members
24+
$cluster_members = $::openshift_origin::real_mcollective_cluster_members
2525

2626
if $cluster_members {
2727
$pool_size = size($cluster_members)

‎manifests/msgserver.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
anchor { 'openshift_origin::msgserver_end': }
2424

2525
$cluster_members = $::openshift_origin::msgserver_cluster_members
26-
$cluster_remote_members = delete($cluster_members, $::openshift_origin::msgserver_hostname)
26+
$cluster_remote_members = delete($cluster_members, $::openshift_origin::msgserver_fqdn)
2727

2828
package { ['activemq','activemq-client']:
2929
ensure => present,

‎manifests/node.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@
136136
value => '1',
137137
}
138138
sysctl::value { 'kernel.shmall':
139-
value => $::openshift_origin::params::_node_shmall,
139+
value => $::openshift_origin::node_shmall,
140140
}
141141
sysctl::value { 'kernel.shmmax':
142-
value => $::openshift_origin::params::_node_shmmax,
142+
value => $::openshift_origin::node_shmmax,
143143
}
144144
sysctl::value { 'kernel.msgmnb':
145145
value => 65536,
@@ -320,7 +320,7 @@
320320

321321
file { '/etc/openshift/env/OPENSHIFT_BROKER_HOST':
322322
ensure => present,
323-
content => $::openshift_origin::broker_hostname,
323+
content => $::openshift_origin::broker_fqdn,
324324
require => File['/etc/openshift/env/'],
325325
owner => 'root',
326326
group => 'root',

‎manifests/params.pp‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,18 @@
9090
default => '/sbin/sysctl',
9191
}
9292

93-
$node_shmmax_default = $::architecture ? {
93+
$node_shmmax = $::architecture ? {
9494
'x86_64' => 68719476736,
9595
default => 33554432,
9696
}
9797

98-
$_node_shmmax = $::openshift_origin::node_shmmax ? {
99-
undef => $node_shmmax_default,
100-
default => $::openshift_origin::node_shmmax,
101-
}
102-
103-
$node_shmall_default = $::architecture ? {
98+
$node_shmall = $::architecture ? {
10499
'x86_64' => 4294967296,
105100
default => 2097152,
106101
}
107102

108-
$_node_shmall = $::openshift_origin::node_shmall ? {
109-
undef => $node_shmall_default,
110-
default => $::openshift_origin::node_shmall,
103+
$repos_base = $::operatingsystem ? {
104+
'Fedora' => 'https://mirror.openshift.com/pub/origin-server/nightly/fedora-19',
105+
default => 'https://mirror.openshift.com/pub/origin-server/nightly/rhel-6',
111106
}
112107
}

‎manifests/plugins/dns/nsupdate.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
fail 'bind_key is required.'
3131
}
3232
if !$::openshift_origin::bind_krb_principal == '' and $::openshift_origin::bind_krb_keytab == '' {
33-
warning "Kerberos keytab for the DNS service was not found. Please generate a keytab for DNS/${::openshift_origin::nameserver_hostname}"
33+
warning "Kerberos keytab for the DNS service was not found. Please generate a keytab for DNS/${::openshift_origin::nameserver_fqdn}"
3434
fail 'bind_krb_keytab is required.'
3535
}
3636

0 commit comments

Comments
 (0)