summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorLingxian Kong <anlin.kong@gmail.com>2020-04-16 17:50:55 +1200
committerLingxian Kong <anlin.kong@gmail.com>2020-04-26 09:56:50 +1200
commit429c39890e3242c6a502037673943b38452c5811 (patch)
tree1ecb67979bcb664996e6f1e1a0146b59567e8a0a /devstack
parenta4057b10af44e7f21243e539dd2daad2ad61657b (diff)
downloadtrove-429c39890e3242c6a502037673943b38452c5811.tar.gz
Support ip address type for instances
Include address type in getting instance response. * Deprecate confip option network_label_regex as we don't reply on Nova to get addresses, network names don't make any sense. * Add 'addresses' in instance API response, keep 'ip' as is but mark it deprecated in API doc, python-troveclient shouldn't break. Story: 2007562 Task: 39445 Change-Id: Ia0458b5ddae8959ce29c17e444e1a51a026283cd
Diffstat (limited to 'devstack')
-rw-r--r--devstack/plugin.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 39f34b63..4de219e4 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -556,7 +556,6 @@ function config_trove_network {
sudo ip route
# Now make sure the conf settings are right
- 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}