arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update tempest config files to use newly renamed test_name_server variable

Browse Source
This commit is contained in:
Chris MacNaughton
2020-09-25 12:49:06 +02:00
parent 522d3e53b8
commit 7bf624b007
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unit_tests/charm_tests/test_tempest.py
View File

@@ -42,7 +42,7 @@ class TestTempestSetup(unittest.TestCase):
'TEST_GATEWAY': 'test',
'TEST_CIDR_EXT': 'test',
'TEST_FIP_RANGE': 'test',
'TEST_NAMESERVER': 'test',
'TEST_NAME_SERVER': 'test',
'TEST_CIDR_PRIV': 'test',
}
tempest_setup.add_environment_var_config(ctxt, ['neutron'])
@@ -55,7 +55,7 @@ class TestTempestSetup(unittest.TestCase):
ctxt = {}
get_deployment_context.return_value = {
'TEST_GATEWAY': 'test',
'TEST_NAMESERVER': 'test',
'TEST_NAME_SERVER': 'test',
'TEST_CIDR_PRIV': 'test',
}
with self.assertRaises(Exception) as context:

2
zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2
View File

@@ -56,7 +56,7 @@ http_image = http://{{ test_swift_ip }}:80/swift/v1/images/cirros-0.3.4-x86_64-u
project_network_cidr = {{ test_cidr_priv }}
{% endif %}
public_network_id = {{ ext_net }}
dns_servers = {{ test_nameserver }}
dns_servers = {{ test_name_server }}
project_networks_reachable = false
[network-feature-enabled]

2
zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
View File

@@ -58,7 +58,7 @@ http_image = http://{{ test_swift_ip }}:80/swift/v1/images/cirros-0.3.4-x86_64-u
project_network_cidr = {{ test_cidr_priv }}
{% endif %}
public_network_id = {{ ext_net }}
dns_servers = {{ test_nameserver }}
dns_servers = {{ test_name_server }}
project_networks_reachable = false
floating_network_name = {{ ext_net }}