Merge "Adds Support for Recent Puppet Module Refactor"
This commit is contained in:
commit
f5e0cd3071
@ -205,27 +205,30 @@
|
||||
" command => \"/bin/hostname \\${my_hostname} ; echo \\${my_hostname} > /etc/hostname\"\n",
|
||||
"}\n",
|
||||
"class { 'openshift_origin' :\n",
|
||||
" roles => ['broker','named','activemq','datastore'],\n",
|
||||
" bind_key => '${DNS_SEC_KEY}',\n",
|
||||
" domain => '${PREFIX}',\n",
|
||||
" register_host_with_named => true,\n",
|
||||
" conf_named_upstream_dns => ['${UPSTREAM_DNS}'],\n",
|
||||
" ntp_servers => ['${UPSTREAM_NTP}'],\n",
|
||||
" broker_hostname => \\$my_hostname,\n",
|
||||
" named_hostname => \\$my_hostname,\n",
|
||||
" datastore_hostname => \\$my_hostname,\n",
|
||||
" activemq_hostname => \\$my_hostname,\n",
|
||||
" broker_auth_plugin => 'htpasswd',\n",
|
||||
" openshift_user1 => '${USERNAME}',\n",
|
||||
" openshift_password1 => '${PASSWORD}',\n",
|
||||
" development_mode => ${DEV_MODE},\n",
|
||||
" roles => ['broker','nameserver','msgserver','datastore'],\n",
|
||||
" bind_key => '${DNS_SEC_KEY}',\n",
|
||||
" domain => '${PREFIX}',\n",
|
||||
" register_host_with_nameserver => true,\n",
|
||||
" conf_nameserver_upstream_dns => ['${UPSTREAM_DNS}'],\n",
|
||||
" ntp_servers => ['${UPSTREAM_NTP}'],\n",
|
||||
" broker_hostname => \\$my_hostname,\n",
|
||||
" nameserver_hostname => \\$my_hostname,\n",
|
||||
" datastore_hostname => \\$my_hostname,\n",
|
||||
" msgserver_hostname => \\$my_hostname,\n",
|
||||
" broker_auth_plugin => 'htpasswd',\n",
|
||||
" openshift_user1 => '${USERNAME}',\n",
|
||||
" openshift_password1 => '${PASSWORD}',\n",
|
||||
" development_mode => ${DEV_MODE},\n",
|
||||
"}\n",
|
||||
"EOF\n",
|
||||
"mkdir -p /etc/puppet/modules\n",
|
||||
"git clone -b ${PUPPET_MODULE_BRANCH} ${PUPPET_MODULE_URL} /etc/puppet/modules/openshift_origin", "\n",
|
||||
"puppet module install puppetlabs/stdlib", "\n",
|
||||
"puppet module install rharrison/lokkit", "\n",
|
||||
"puppet module install puppetlabs/ntp", "\n",
|
||||
"puppet apply --verbose /root/configure.pp | tee /var/log/configure_openshift.log", "\n",
|
||||
"puppet module install puppetlabs/stdlib", "\n",
|
||||
"puppet module install blentz/selinux_types", "\n",
|
||||
"puppet module install duritong/sysctl", "\n",
|
||||
"puppet apply -v -d /root/configure.pp | tee /var/log/configure_openshift.log", "\n",
|
||||
"/opt/aws/bin/cfn-signal -e 0 --data \"${DNS_SEC_KEY}\" -r \"Broker setup complete\" \"${BROKER_WAIT_HANDLE}\"\n"
|
||||
]
|
||||
]
|
||||
@ -290,26 +293,29 @@
|
||||
" command => \"/bin/hostname \\${my_hostname} ; echo \\${my_hostname} > /etc/hostname\"\n",
|
||||
"}\n",
|
||||
"class { 'openshift_origin' :\n",
|
||||
" roles => ['node'],\n",
|
||||
" bind_key => '${DNS_SEC_KEY}',\n",
|
||||
" named_ip_addr => '${BROKER_IP}',\n",
|
||||
" domain => '${PREFIX}',\n",
|
||||
" register_host_with_named => true,\n",
|
||||
" broker_hostname => '${BROKER_IP}',\n",
|
||||
" activemq_hostname => '${BROKER_IP}',\n",
|
||||
" ntp_servers => ['${UPSTREAM_NTP}'],\n",
|
||||
" node_hostname => \\$my_hostname,\n",
|
||||
" install_method => 'yum',\n",
|
||||
" jenkins_repo_base => 'http://pkg.jenkins-ci.org/redhat',\n",
|
||||
" install_cartridges => ['php', 'mysql'],\n",
|
||||
" development_mode => ${DEV_MODE},\n",
|
||||
" roles => ['node'],\n",
|
||||
" bind_key => '${DNS_SEC_KEY}',\n",
|
||||
" nameserver_ip_addr => '${BROKER_IP}',\n",
|
||||
" domain => '${PREFIX}',\n",
|
||||
" register_host_with_nameserver => true,\n",
|
||||
" broker_hostname => '${BROKER_IP}',\n",
|
||||
" msgserver_hostname => '${BROKER_IP}',\n",
|
||||
" ntp_servers => ['${UPSTREAM_NTP}'],\n",
|
||||
" node_hostname => \\$my_hostname,\n",
|
||||
" install_method => 'yum',\n",
|
||||
" jenkins_repo_base => 'http://pkg.jenkins-ci.org/redhat',\n",
|
||||
" install_cartridges => ['php', 'mysql'],\n",
|
||||
" development_mode => ${DEV_MODE},\n",
|
||||
"}\n",
|
||||
"EOF\n",
|
||||
"mkdir -p /etc/puppet/modules\n",
|
||||
"git clone -b ${PUPPET_MODULE_BRANCH} ${PUPPET_MODULE_URL} /etc/puppet/modules/openshift_origin", "\n",
|
||||
"puppet module install puppetlabs/stdlib", "\n",
|
||||
"puppet module install rharrison/lokkit", "\n",
|
||||
"puppet module install puppetlabs/ntp", "\n",
|
||||
"puppet apply --verbose /root/configure.pp | tee /var/log/configure_openshift.log", "\n",
|
||||
"puppet module install puppetlabs/stdlib", "\n",
|
||||
"puppet module install blentz/selinux_types", "\n",
|
||||
"puppet module install duritong/sysctl", "\n",
|
||||
"puppet apply -v -d /root/configure.pp | tee /var/log/configure_openshift.log", "\n",
|
||||
"/opt/aws/bin/cfn-signal -e 0 -r \"Node setup complete\" \"${NODE_WAIT_HANDLE}\"\n"
|
||||
]
|
||||
]
|
||||
|
Loading…
x
Reference in New Issue
Block a user