summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorLingxian Kong <anlin.kong@gmail.com>2019-12-09 12:04:47 +1300
committerLingxian Kong <anlin.kong@gmail.com>2019-12-10 12:18:32 +1300
commitd93a4109436af6517b9f9276b27c517a30bcd86e (patch)
tree30da3d0f801d5a2af98a0f5c7a44e4f9beb2519e /devstack
parentb2a31c5ac5b2abd902a075fa20db07962511faee (diff)
downloadtrove-d93a4109436af6517b9f9276b27c517a30bcd86e.tar.gz
Fix delete instance
Deal with the situation when Trove fails to look for the Nova server when waiting for the db instance ACTIVE Change-Id: I484d45f24176c89d999864d3eb1c48860b3038bd
Diffstat (limited to 'devstack')
-rw-r--r--devstack/plugin.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 18b0118a..8f4b3d9e 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -559,7 +559,7 @@ function config_trove_network {
sudo ip route
# Now make sure the conf settings are right
- iniset $TROVE_CONF DEFAULT network_label_regex ${PRIVATE_NETWORK_NAME}
+ iniset $TROVE_CONF DEFAULT network_label_regex ""
iniset $TROVE_CONF DEFAULT ip_regex ""
iniset $TROVE_CONF DEFAULT black_list_regex ""
iniset $TROVE_CONF DEFAULT management_networks ${mgmt_net_id}