From fbefb86c43059283ba4c196e6e733830291e018b Mon Sep 17 00:00:00 2001 From: Nagendra Chandran Date: Fri, 15 Jul 2016 02:15:31 +0000 Subject: [PATCH] Rhel7-liberty: neutron endpoint created by packstack Change-Id: I3f5d9cbecf5281a92836b30b9c63325262d12c46 Closes-Bug: 160327 --- fabfile/contraillabs/rdo.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fabfile/contraillabs/rdo.py b/fabfile/contraillabs/rdo.py index c5f1c4c62..b1542499a 100644 --- a/fabfile/contraillabs/rdo.py +++ b/fabfile/contraillabs/rdo.py @@ -130,6 +130,15 @@ def setup_rhosp_node(): endpoint_id_openstack = sudo('source /etc/contrail/openstackrc; keystone endpoint-list 2> /dev/null | grep %s:9696 | tr -d " " | cut -d "|" -f2' % os_ip) # remove endpoint list sudo('source /etc/contrail/openstackrc; keystone endpoint-delete %s' % endpoint_id_openstack) + with settings(warn_only=True): + status = sudo('source /etc/contrail/openstackrc; keystone endpoint-list | grep %s' % endpoint_id_openstack) + if status.succeeded: + print "WARNING: Neutron Endpoint pointing to openstack node is not removed" + print "WARNING: Removing neutron endpoint pointing to openstack node from db" + sudo('mysql -u root -o keystone -e "delete from endpoint where url=\'http://%s:9696\'";' % os_ip) + status = sudo('source /etc/contrail/openstackrc; keystone endpoint-list | grep %s' % endpoint_id_openstack) + if status.succeeded: + raise RuntimeError('Delete neutron endpoint pointing to openstack node from db failed') # recreate with cfgm endpoint_cfgm = 'http://%s:9696' % cfgm_0_ip