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

Commit bead518

Browse files
detiberdetiber
committed
Merge pull request #340 from detiber/bz1162093
Multiple bug fixes for register_dns
2 parents b323123 + ed8fb54 commit bead518

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+274
-124
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: 104 additions & 43 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,
@@ -769,27 +766,31 @@
769766
$jenkins_repo_base = undef,
770767
$optional_repo = undef,
771768
$domain = 'example.com',
772-
$broker_hostname = "broker.${domain}",
773-
$node_hostname = "node.${domain}",
774-
$nameserver_hostname = "ns1.${domain}",
775-
$msgserver_hostname = "msgserver.${domain}",
776-
$datastore_hostname = "mongodb.${domain}",
777-
$datastore1_ip_addr = undef,
778-
$datastore2_ip_addr = undef,
779-
$datastore3_ip_addr = undef,
780-
$nameserver_ip_addr = $::ipaddress,
781769
$bind_key = '',
782770
$bind_key_algorithm = 'HMAC-MD5',
783771
$bind_krb_keytab = '',
784772
$bind_krb_principal = '',
773+
$dns_infrastructure_zone = '',
774+
$dns_infrastructure_key = '',
775+
$dns_infrastructure_key_algorithm = 'HMAC-MD5',
776+
$dns_infrastructure_names = [],
777+
$broker_hostname = '',
778+
$node_hostname = '',
779+
$nameserver_hostname = '',
780+
$msgserver_hostname = '',
781+
$datastore_hostname = '',
782+
$datastore1_ip_addr = undef,
783+
$datastore2_ip_addr = undef,
784+
$datastore3_ip_addr = undef,
785+
$nameserver_ip_addr = $::ipaddress,
785786
$aws_access_key_id = '',
786787
$aws_secret_key = '',
787788
$aws_zone_id = '',
788789
$broker_ip_addr = $::ipaddress,
789790
$broker_cluster_members = undef,
790791
$broker_cluster_ip_addresses = undef,
791792
$broker_virtual_ip_address = undef,
792-
$broker_virtual_hostname = "broker.${domain}",
793+
$broker_virtual_hostname = '',
793794
$load_balancer_master = false,
794795
$load_balancer_auth_password = 'changeme',
795796
$node_ip_addr = $::ipaddress,
@@ -817,7 +818,7 @@
817818
$ntp_servers = ['time.apple.com iburst', 'pool.ntp.org iburst', 'clock.redhat.com iburst'],
818819
$msgserver_cluster = false,
819820
$msgserver_cluster_members = undef,
820-
$mcollective_cluster_members = $msgserver_cluster_members,
821+
$mcollective_cluster_members = undef,
821822
$msgserver_password = 'changeme',
822823
$msgserver_admin_password = inline_template('<%= require "securerandom"; SecureRandom.base64 %>'),
823824
$mcollective_user = 'mcollective',
@@ -841,14 +842,8 @@
841842
$conf_broker_auth_private_key = undef,
842843
$conf_broker_session_secret = undef,
843844
$conf_broker_multi_haproxy_per_node = false,
844-
$conf_console_product_logo = $ose_version ? {
845-
undef => '/assets/logo-origin.svg',
846-
default => '/assets/logo-enterprise-horizontal.svg',
847-
},
848-
$conf_console_product_title = $ose_version ? {
849-
undef => 'OpenShift Origin',
850-
default => 'OpenShift Enterprise',
851-
},
845+
$conf_console_product_logo = undef,
846+
$conf_console_product_title = undef,
852847
$conf_console_session_secret = undef,
853848
$conf_valid_gear_sizes = ['small'],
854849
$conf_default_gear_capabilities = ['small'],
@@ -863,8 +858,8 @@
863858
$broker_ldap_uri = '',
864859
$broker_ldap_bind_dn = '',
865860
$broker_ldap_bind_password = '',
866-
$node_shmmax = undef,
867-
$node_shmall = undef,
861+
$node_shmmax = $openshift_origin::params::node_shmmax,
862+
$node_shmall = $openshift_origin::params::node_shmall,
868863
$node_container_plugin = 'selinux',
869864
$node_frontend_plugins = ['apache-vhost','nodejs-websocket'],
870865
$node_unmanaged_users = [],
@@ -881,36 +876,102 @@
881876
$conf_node_custom_motd = undef,
882877
$development_mode = false,
883878
$conf_nameserver_upstream_dns = ['8.8.8.8'],
879+
$conf_nameserver_allow_recursion = false,
884880
$install_login_shell = false,
885881
$register_host_with_nameserver = false,
886-
$dns_infrastructure_zone = '',
887-
$dns_infrastructure_key = '',
888-
$dns_infrastructure_key_algorithm = 'HMAC-MD5',
889-
$dns_infrastructure_names = [],
890882
$update_network_conf_files = true,
891-
$install_cartridges = $ose_version ? {
892-
undef => ['10gen-mms-agent','cron','diy','haproxy','mongodb','nodejs',
893-
'perl','php','phpmyadmin','postgresql','python','ruby',
894-
'jenkins','jenkins-client','mysql',],
895-
default => ['cron','diy','haproxy','mongodb','nodejs','perl','php',
896-
'postgresql','python','ruby','jenkins','jenkins-client',
897-
'jbossews','mysql'],
898-
},
899-
$install_cartridges_recommended_deps = $ose_version ? {
900-
undef => ['diy','nodejs','perl','php','python','ruby'],
901-
default => ['jbossews','nodejs','perl','php','python','ruby'],
902-
},
883+
$install_cartridges = undef,
884+
$install_cartridges_recommended_deps = undef,
903885
$install_cartridges_optional_deps = undef,
904886
$manage_firewall = true,
905-
){
887+
) inherits openshift_origin::params {
906888
include openshift_origin::role
907889

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

913-
if $msgserver_cluster and ! $msgserver_cluster_members and ! $mcollective_cluster_members {
970+
if $msgserver_cluster_members and $mcollective_cluster_members == undef {
971+
$real_mcollective_cluster_members = $msgserver_cluster_members
972+
}
973+
974+
if $msgserver_cluster and ! $msgserver_cluster_members and ! $real_mcollective_cluster_members {
914975
fail('msgserver_cluster_members and mcollective_cluster_members parameters are required when msgserver_cluster is set')
915976
}
916977

‎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/nameserver.pp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@
110110
group => 'named',
111111
mode => '0644',
112112
content => template('openshift_origin/named/oo_infrastructure.conf.erb'),
113-
replace => false,
114113
require => File['/var/named']
115114
}
116115

@@ -142,7 +141,6 @@
142141
} else {
143142
file { 'empty infrastructure host configuration':
144143
ensure => present,
145-
replace => false,
146144
path => '/var/named/oo_infrastructure.conf',
147145
owner => 'root',
148146
group => 'named',

‎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
}

0 commit comments

Comments
 (0)