diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-28 06:56:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-28 06:56:39 +0000 |
| commit | 1f5940e28376068f3663c0c2cc237e582392b2f1 (patch) | |
| tree | 7ccca151230eb221989364d75fa9f2d76ef87e83 /devstack | |
| parent | e590560a73df2a757d6da9cbc633cf2959f79155 (diff) | |
| parent | 44fbcfaaa608aba9184bd8757ba60c6a8155bae1 (diff) | |
| download | trove-1f5940e28376068f3663c0c2cc237e582392b2f1.tar.gz | |
Merge "Deprecate the config option default_neutron_networks"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/plugin.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index cc53a2cc..8f7f3bcb 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -524,16 +524,16 @@ function finalize_trove_network { iniset $TROVE_CONF DEFAULT ip_regex "" iniset $TROVE_CONF DEFAULT black_list_regex "" # Don't use a default network for now, until the neutron issues are figured out - #iniset $TROVE_CONF DEFAULT default_neutron_networks "${ALT_MGMT_ID}" - iniset $TROVE_CONF DEFAULT default_neutron_networks "" + #iniset $TROVE_CONF DEFAULT management_networks "${ALT_MGMT_ID}" + iniset $TROVE_CONF DEFAULT management_networks "" iniset $TROVE_CONF DEFAULT network_driver trove.network.neutron.NeutronDriver iniset $TROVE_TASKMANAGER_CONF DEFAULT network_label_regex "${ALT_PRIVATE_NETWORK_NAME}" iniset $TROVE_TASKMANAGER_CONF DEFAULT ip_regex "" iniset $TROVE_TASKMANAGER_CONF DEFAULT black_list_regex "" # Don't use a default network for now, until the neutron issues are figured out - #iniset $TROVE_TASKMANAGER_CONF DEFAULT default_neutron_networks "${ALT_MGMT_ID}" - iniset $TROVE_CONF DEFAULT default_neutron_networks "" + #iniset $TROVE_TASKMANAGER_CONF DEFAULT management_networks "${ALT_MGMT_ID}" + iniset $TROVE_CONF DEFAULT management_networks "" iniset $TROVE_TASKMANAGER_CONF DEFAULT network_driver trove.network.neutron.NeutronDriver } |