From: Michael Chapman <woppin@gmail.com>
Date: Tue, 7 Jun 2016 04:34:04 +0000 (+1000)
Subject: Remove swift endpoint and service
X-Git-Tag: colorado.1.0~189^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F15245%2F2;p=apex.git

Remove swift endpoint and service

Swift is not functional, and ceph is used instead for glance, nova and cinder,
so the endpoint should not be present in the overcloud. The endpoint is
removed via CLI post-install since there is no parameter for overcloud.yaml
to disable endpoint creation, and the mechanism for endpoint creation will
likely change within the next release as it is moved from heat to puppet.

JIRA: APEX-146

Change-Id: If91b9d2747d5eed89c569ed9a34ab84370c3d65f
Signed-off-by: Michael Chapman <woppin@gmail.com>
---

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 30a6af29..6ccd4c8c 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -939,6 +939,12 @@ set -o errexit
 echo "Configuring Neutron external network"
 neutron net-create external --router:external=True --tenant-id \$(keystone tenant-get service | grep id | awk '{ print \$4 }')
 neutron subnet-create --name external-net --tenant-id \$(keystone tenant-get service | grep id | awk '{ print \$4 }') --disable-dhcp external --gateway ${public_network_gateway} --allocation-pool start=${public_network_floating_ip_range%%,*},end=${public_network_floating_ip_range##*,} ${public_network_cidr}
+
+echo "Removing swift endpoint and service"
+swift_service_id=\$(keystone service-list | grep swift | cut -d ' ' -f 2)
+swift_endpoint_id=\$(keystone endpoint-list | grep \$swift_service_id | cut -d ' ' -f 2)
+keystone endpoint-delete \$swift_endpoint_id
+keystone service-delete \$swift_service_id
 EOI
 
   echo -e "${blue}INFO: Checking if OVS bridges have IP addresses...${reset}"