summaryrefslogtreecommitdiffstats
path: root/ci/deploy.sh
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2015-12-14 14:42:51 -0500
committerDan Radez <dradez@redhat.com>2016-01-11 19:56:03 -0500
commit95adbace2c76a337027333077a75fe920a868b20 (patch)
tree394ab68b2ce2ebd187b7bf4db4fc7c7b70889ea2 /ci/deploy.sh
parent85485bca140826c2302b5c5a789de9328c3caec8 (diff)
enabling ceph
Change-Id: I2dc1bf7ffebb6a83face87a62a81cfb15f9a0689
Diffstat (limited to 'ci/deploy.sh')
-rwxr-xr-xci/deploy.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 9d5d9d28..c7c8491c 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -678,8 +678,13 @@ if [[ "$net_isolation_enabled" == "TRUE" ]]; then
openstack-config --set undercloud.conf DEFAULT dhcp_end ${admin_network_dhcp_range##*,}
openstack-config --set undercloud.conf DEFAULT inspection_iprange ${admin_network_introspection_range}
openstack-config --set undercloud.conf DEFAULT undercloud_debug false
+
fi
+sudo sed -i '/CephClusterFSID:/c\\ CephClusterFSID: \\x27$(cat /proc/sys/kernel/random/uuid)\\x27' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml
+sudo sed -i '/CephMonKey:/c\\ CephMonKey: \\x27'"\$(ceph-authtool --gen-print-key)"'\\x27' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml
+sudo sed -i '/CephAdminKey:/c\\ CephAdminKey: \\x27'"\$(ceph-authtool --gen-print-key)"'\\x27' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml
+
openstack undercloud install &> apex-undercloud-install.log
sleep 30
sudo systemctl restart openstack-glance-api
@@ -710,6 +715,9 @@ function undercloud_prep_overcloud_deploy {
exit 1
fi
+ # make sure ceph is installed
+ DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml"
+
# check if HA is enabled
if [[ "$ha_enabled" == "TRUE" ]]; then
DEPLOY_OPTIONS+=" --control-scale 3 --compute-scale 2"