From e3fbce4715e80db1ca6e48ac0cefdef383301058 Mon Sep 17 00:00:00 2001 From: Michael Chapman Date: Thu, 16 Jun 2016 16:30:55 -0400 Subject: Remove sahara endpoint Sahara isn't installed, and having the endpoint confuses testing services. This patch removes the endpoint after deployment. Change-Id: Iaab227d398704c31911feaf7ea3bfbfa655d0f54 JIRA: APEX-176 Signed-off-by: Michael Chapman --- ci/deploy.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ci/deploy.sh b/ci/deploy.sh index 05e2fa2b..a004dd36 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -1044,11 +1044,18 @@ echo "Configuring Neutron external network" neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') neutron subnet-create --name external-net --tenant-id \$(openstack project show 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 sahara endpoint and service" +sahara_service_id=\$(openstack service list | grep sahara | cut -d ' ' -f 2) +sahara_endpoint_id=\$(openstack endpoint list | grep sahara | cut -d ' ' -f 2) +openstack endpoint delete \$sahara_endpoint_id +openstack service delete \$sahara_service_id + echo "Removing swift endpoint and service" swift_service_id=\$(openstack service list | grep swift | cut -d ' ' -f 2) swift_endpoint_id=\$(openstack endpoint list | grep swift | cut -d ' ' -f 2) openstack endpoint delete \$swift_endpoint_id openstack service delete \$swift_service_id + EOI echo -e "${blue}INFO: Checking if OVS bridges have IP addresses...${reset}" -- cgit 1.2.3-korg