openstack
/
heat-templates
Code Issues Proposed changes

OpenShift.template fixes 

This includes the following changes:
- requests from outside the broker were not reaching it without
  setting configure_firewall => true
- puppet module install was failing due to missing /etc/puppet/modules
- on the node puppet --apply was failing because the openshift_origin
  module wasn't installed
Change-Id: Ie6f1f0f6e2bdbde1521ffdd285041c87f3933e42
This commit is contained in:
Steve Baker 2013-05-27 09:34:33 +12:00
parent 92a15bdd92
commit b306f94c89
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openshift-origin/OpenShift.template
View File

@ -157,7 +157,7 @@
" dns_servers => [\"", { "Ref": "UpstreamDNS" }, "\"],\n",
" os_unmanaged_users => [\"ec2-user\"],\n",
" enable_network_services => true,\n",
" configure_firewall => false,\n",
" configure_firewall => true,\n",
" configure_ntp => true,\n",
" configure_activemq => true,\n",
" configure_qpid => false,\n",
@ -173,6 +173,7 @@
" broker_fqdn => \\$my_hostname,\n",
"}\n",
"EOF\n",
"mkdir -p /etc/puppet/modules\n",
"puppet module install openshift/openshift_origin", "\n",
"puppet apply --verbose /root/configure.pp | tee /var/log/configure_openshift.log", "\n",
"service network restart | tee /var/log/configure_openshift.log;\n",
@ -246,7 +247,7 @@
" dns_servers => [\"", { "Fn::GetAtt": [ "BrokerInstance", "PublicIp" ] }, "\"],\n",
" os_unmanaged_users => [\"ec2-user\"],\n",
" enable_network_services => true,\n",
" configure_firewall => false,\n",
" configure_firewall => true,\n",
" configure_ntp => true,\n",
" configure_activemq => false,\n",
" configure_qpid => false,\n",
@ -262,6 +263,8 @@
" broker_fqdn => \"", { "Fn::GetAtt": [ "BrokerInstance", "PublicIp" ] }, "\",\n",
"}\n",
"EOF\n",
"mkdir -p /etc/puppet/modules\n",
"puppet module install openshift/openshift_origin", "\n",
"puppet apply --verbose /root/configure.pp | tee /var/log/configure_openshift.log;", "\n",
"service network restart | tee /var/log/configure_openshift.log;\n",
"service cgconfig restart | tee /var/log/configure_openshift.log;\n",