Merge "F18 openshift tdls, remove boto pip install"
This commit is contained in:
commit
e24ac943be
|
@ -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 install -y ruby-irb ruby-libs tar bind yum-plugin-priorities mysql-devel mongodb-devel;
|
||||||
yum -y update;
|
yum -y update;
|
||||||
sed --in-place -e s/Type=oneshot/"Type=oneshot\nTimeoutSec=0"/ /lib/systemd/system/cloud-final.service;
|
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;
|
cfn-create-aws-symlinks --source /usr/bin;
|
||||||
</command>
|
</command>
|
||||||
</commands>
|
</commands>
|
||||||
|
|
|
@ -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;
|
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;
|
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;
|
cfn-create-aws-symlinks --source /usr/bin;
|
||||||
|
|
||||||
</command>
|
</command>
|
||||||
|
|
Loading…
Reference in New Issue