summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2017-03-30 23:03:43 -0400
committerDan Radez <dradez@redhat.com>2017-05-10 08:09:00 -0400
commitbb23cfe3dbf112d7cffdbec2c7937492aecfe36b (patch)
tree62db2c904a09b2930761eaa075288280dc4c17bf /lib
parentac3a86983e4c049a3115c7bd77eeacaeb19d0ca3 (diff)
Couple cleanups related to ocata update
- remove glance v2 enable - remove bgpvpn Change-Id: I2e09067e4f81c8a48e8f12475451b2a3c40289a7 Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'lib')
-rwxr-xr-xlib/undercloud-functions.sh7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh
index a17036ac..d324b0b8 100755
--- a/lib/undercloud-functions.sh
+++ b/lib/undercloud-functions.sh
@@ -196,13 +196,6 @@ sudo sed -i '/CephClusterFSID:/c\\ CephClusterFSID: \\x27$(cat /proc/sys/kernel
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
-#####
-# TEMP WORKAROUND, REMOVE WHEN SNAPS SUPPORTS GLANCE API v2
-# JIRA: SNAPS-66
-#####
-sudo sed -i '/glance::api::enable_v1_api/ s/false/true/' -i /usr/share/openstack-tripleo-heat-templates/puppet/services/glance-api.yaml
-
-
openstack undercloud install &> apex-undercloud-install.log || {
# cat the undercloud install log incase it fails
echo "ERROR: openstack undercloud install has failed. Dumping Log:"