summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorMichael Chapman <michapma@redhat.com>2016-06-16 16:30:55 -0400
committerMichael Chapman <michapma@redhat.com>2016-06-16 16:31:50 -0400
commite3fbce4715e80db1ca6e48ac0cefdef383301058 (patch)
treef85711f484d9f62fdbdd1279f2b9f7a621132aac /ci
parent85759538077aad6e3c2e87ac7a6be5a2f1fb8803 (diff)
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 <michapma@redhat.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh7
1 files changed, 7 insertions, 0 deletions
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}"