diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-28 14:47:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-28 14:47:41 +0000 |
| commit | c9e1eff5278a8ec9faf62bcab48415882f2ef105 (patch) | |
| tree | 63a9ec3dcb603cc0b52191565a5d1bc0eb6c9509 | |
| parent | e4162e980cccf78e60acbbf1ec3f590637f5a3a8 (diff) | |
| parent | e3fbce4715e80db1ca6e48ac0cefdef383301058 (diff) | |
Merge "Remove sahara endpoint"
| -rwxr-xr-x | ci/deploy.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index fba83a9c..6a5495c4 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -1067,11 +1067,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}" |