summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild/overcloud-opendaylight.sh5
-rwxr-xr-xlib/overcloud-deploy-functions.sh1
-rwxr-xr-xlib/undercloud-functions.sh7
3 files changed, 0 insertions, 13 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index bacf5360..35d9bac3 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -89,10 +89,5 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--upload ${CACHE_DIR}/odl-netvirt-vpp-distribution.tar.gz:/root/ \
-a overcloud-full-opendaylight_build.qcow2
- # TODO: Put bgpvpn back into the build
- #--upload ${BUILD_DIR}/networking-bgpvpn.tar.gz:/root/ \
- #--run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && yum localinstall -y *networking-bgpvpn*.rpm" \
- #--run-command "rm -f /etc/neutron/networking_bgpvpn.conf" \
- #--run-command "touch /etc/neutron/networking_bgpvpn.conf" \
LIBGUESTFS_BACKEND=direct virt-sparsify --compress overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2
popd > /dev/null
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index f26a72a3..1c5e4d0a 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -122,7 +122,6 @@ EOI
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "systemctl enable zrpcd" \
- --run-command "systemctl enable bgpd" \
-a overcloud-full.qcow2
EOI
fi
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:"