diff --git a/heat_integrationtests/common/config.py b/heat_integrationtests/common/config.py index f07ee86203..ce7407a1b9 100644 --- a/heat_integrationtests/common/config.py +++ b/heat_integrationtests/common/config.py @@ -65,6 +65,9 @@ IntegrationTestGroup = [ cfg.StrOpt('fixed_network_name', default='private', help="Visible fixed network name "), + cfg.StrOpt('floating_network_name', + default='public', + help="Visible floating network name "), cfg.StrOpt('boot_config_env', default=('heat_integrationtests/scenario/templates' '/boot_config_none_env.yaml'), diff --git a/heat_integrationtests/heat_integrationtests.conf.sample b/heat_integrationtests/heat_integrationtests.conf.sample index 02a16df2c9..e6207c7a9b 100644 --- a/heat_integrationtests/heat_integrationtests.conf.sample +++ b/heat_integrationtests/heat_integrationtests.conf.sample @@ -52,6 +52,9 @@ # Visible fixed network name (string value) #fixed_network_name = private +# Visible floating network name (string value) +#floating_network_name = public + # Path to environment file which defines the resource type # Heat::InstallConfigAgent. Needs to be appropriate for the image_ref. (string # value) diff --git a/heat_integrationtests/scenario/test_neutron_loadbalancer.py b/heat_integrationtests/scenario/test_neutron_loadbalancer.py index 3f4925194e..0591e5bdda 100644 --- a/heat_integrationtests/scenario/test_neutron_loadbalancer.py +++ b/heat_integrationtests/scenario/test_neutron_loadbalancer.py @@ -24,7 +24,7 @@ class NeutronLoadBalancerTest(scenario_base.ScenarioTestsBase): def setUp(self): super(NeutronLoadBalancerTest, self).setUp() - self.public_net = self._get_network('public') + self.public_net = self._get_network(self.conf.floating_network_name) self.template_name = 'test_neutron_loadbalancer.yaml' def collect_responses(self, ip, expected_resp):