diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-12 21:41:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-12 21:41:13 +0000 |
| commit | 97c69d0537c55f7c0a7727028579a83e8e35dac6 (patch) | |
| tree | 8ee75c2b77b7294a21ec9a76d8535d923fb985df | |
| parent | 217209bf16b12606f786b742e4f9ced2b423ea20 (diff) | |
| parent | 796bc347d2cd34451b24c8c19d4c7747a4c054c3 (diff) | |
| download | trove-97c69d0537c55f7c0a7727028579a83e8e35dac6.tar.gz | |
Merge "blacklist_regex is not an option" into stable/mitaka
| -rw-r--r-- | devstack/plugin.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 25237ea2..8ffc9f12 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -226,7 +226,7 @@ function finalize_trove_network { iniset $TROVE_CONF DEFAULT network_label_regex .* iniset $TROVE_CONF DEFAULT ip_regex .* - iniset $TROVE_CONF DEFAULT blacklist_regex ^10.0.1.* + iniset $TROVE_CONF DEFAULT black_list_regex ^10.0.1.* iniset $TROVE_CONF DEFAULT default_neutron_networks $management_network_id iniset $TROVE_CONF DEFAULT network_driver trove.network.neutron.NeutronDriver |