summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-06-09 15:56:11 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-09 15:56:11 +0000
commitcb843694f4b000b96c05bf0d08a0c17cdc8ff84e (patch)
tree5facf2cb368f541476318b1011086b0f7720ddb2 /ci
parent2fefb7de8758acd7d2ce4ee86c47474932fb651e (diff)
parente596a9b9eeda6f68265b691d181f1da05ba60e11 (diff)
Merge "Remove swift endpoint and service"
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 5f530530..6510053e 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -1018,6 +1018,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}"