summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2016-11-24 23:34:45 -0500
committerTim Rozet <trozet@redhat.com>2017-01-24 17:31:33 +0000
commit0cfe33dc6ab194d762acc2e868b9ca9c67263c42 (patch)
tree19c01d293c9e97d0d024008a856df5a01603f234
parentb2c83b7b93ac15e41e4788382dcb2c83c0e5ef10 (diff)
fix post-install.sh
If sahara and swift are not configured, the post install script will fail during removals of endpoints for sahara and swift. This patch adds checks whether endpoints to be removed exist or not. Change-Id: I8e417dbe6e51461d7c4ef1e2368865917b2f8279 Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
-rwxr-xr-xlib/post-install-functions.sh8
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