diff options
| author |   Dan Radez <dradez@redhat.com> | 2017-01-25 14:38:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-25 14:38:59 +0000 |
| commit | ed3c1140b28494a1de9fd2b7e25b8df08f716797 (patch) | |
| tree | 8473fd46b781d5d7b072596f4ee00b79e4d4458f | |
| parent | 321339e24396b987cb2ec830b173e0a4445005d6 (diff) | |
| parent | 0cfe33dc6ab194d762acc2e868b9ca9c67263c42 (diff) | |
Merge "fix post-install.sh"
| -rwxr-xr-x | lib/post-install-functions.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index c951478a..51287c4b 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -107,14 +107,14 @@ fi 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 +[[ -n "\$sahara_endpoint_id" ]] && openstack endpoint delete \$sahara_endpoint_id +[[ -n "\$sahara_service_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 +[[ -n "\$swift_endpoint_id" ]] && openstack endpoint delete \$swift_endpoint_id +[[ -n "\$swift_service_id" ]] && openstack service delete \$swift_service_id if [ "${deploy_options_array['dataplane']}" == 'fdio' ] || [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then for flavor in \$(openstack flavor list -c Name -f value); do |