openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Revert "Temporarily disable mistral on the undercloud""

This commit is contained in:
Jenkins 2016-04-29 13:10:00 +00:00 committed by Gerrit Code Review
parent 6138f8c776 108a13dbde
commit 43c1926514
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/tripleo.sh
View File

@ -373,12 +373,6 @@ function undercloud {
sudo yum install -y python-tripleoclient
# Mistral currently is working with trunk oslo_messaging
# https://bugs.launchpad.net/tripleo/+bug/1567493
# exporting ENABLE_MISTRAL=false isn't working so bruteforcing it our with sed
sudo yum install -y --nogpg instack-undercloud
sudo sed -i -e 's/enable_mistral:.*/enable_mistral: false/g' /usr/share/instack-undercloud/puppet-stack-config/puppet-stack-config.yaml.template
if [ ! -f ~/undercloud.conf ]; then
cp -b -f $UNDERCLOUD_CONF ~/undercloud.conf
else