summaryrefslogtreecommitdiffstats
path: root/build/instack.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-04-18 20:08:50 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-04-18 20:08:50 +0000
commit6f963fcbac229032a68cbd4b83e4c3bd4dfd09cd (patch)
tree858d9f827eec589e0094a371b408d8b9cedd4072 /build/instack.sh
parent326d5c2d12cf7fa73b4f66be6daf5671a19f34b9 (diff)
parent39a9b6a47096d0660e3a14ff0fea9718735e6f29 (diff)
Merge "Deploy ceph OSDs on the compute nodes too" into stable/brahmaputra
Diffstat (limited to 'build/instack.sh')
-rwxr-xr-xbuild/instack.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/build/instack.sh b/build/instack.sh
index 3dfbf622..5982ce95 100755
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -230,8 +230,7 @@ PACKAGES+=",ceph-common"
# install the packages above and enabling ceph to live on the controller
LIBGUESTFS_BACKEND=direct virt-customize --install $PACKAGES \
--run-command "sed -i '/ControllerEnableCephStorage/c\\ ControllerEnableCephStorage: true' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" \
- --run-command "sed -i '/ \$enable_ceph = /c\\ \$enable_ceph = true' /usr/share/openstack-tripleo-heat-templates/puppet/manifests/overcloud_controller_pacemaker.pp" \
- --run-command "sed -i '/ \$enable_ceph = /c\\ \$enable_ceph = true' /usr/share/openstack-tripleo-heat-templates/puppet/manifests/overcloud_controller.pp" \
+ --run-command "sed -i '/ComputeEnableCephStorage/c\\ ComputeEnableCephStorage: true' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" \
-a instack.qcow2
popd