openstack
/
heat-templates
Code Issues Proposed changes

Merge "F18 openshift tdls, remove boto pip install"

This commit is contained in:
Jenkins 2013-05-25 05:16:36 +00:00 committed by Gerrit Code Review
parent da055988ff bb866777ba
commit e24ac943be
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openshift-origin/F18-x86_64-openshift-origin-broker-cfntools.tdl
View File

@ -53,7 +53,7 @@ yum install -y policycoreutils mcollective httpd openssh-server rhc activemq ac
yum install -y ruby-irb ruby-libs tar bind yum-plugin-priorities mysql-devel mongodb-devel;
yum -y update;
sed --in-place -e s/Type=oneshot/"Type=oneshot\nTimeoutSec=0"/ /lib/systemd/system/cloud-final.service;
pip-python install 'boto==2.5.2' heat-cfntools;
pip-python install heat-cfntools;
cfn-create-aws-symlinks --source /usr/bin;
</command>
</commands>

2
openshift-origin/F18-x86_64-openshift-origin-node-cfntools.tdl
View File

@ -59,7 +59,7 @@ yum install -y openshift-origin-cartridge-ruby-1.9 openshift-origin-cartridge-ph
yum install -y openshift-origin-cartridge-perl-5.16 openshift-origin-cartridge-phpmyadmin-3.5;
sed --in-place -e s/Type=oneshot/"Type=oneshot\nTimeoutSec=0"/ /lib/systemd/system/cloud-final.service;
pip-python install 'boto==2.5.2' heat-cfntools;
pip-python install heat-cfntools;
cfn-create-aws-symlinks --source /usr/bin;
</command>