Merge "blacklist_regex is not an option"

This commit is contained in:
Jenkins 2016-04-18 12:08:56 +00:00 committed by Gerrit Code Review
commit 3db9d0e4f4

View File

@ -221,7 +221,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