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

Only configure private Neutron CIDR if it is configured

Browse Source
This commit is contained in:
Chris MacNaughton
2020-09-25 10:39:13 +02:00
parent 1ab3aea3a5
commit 522d3e53b8
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zaza/openstack/charm_tests/tempest/setup.py
View File

@@ -26,10 +26,12 @@ import zaza.openstack.charm_tests.glance.setup as glance_setup
SETUP_ENV_VARS = {
'neutron': ['TEST_GATEWAY', 'TEST_CIDR_EXT', 'TEST_FIP_RANGE',
'TEST_NAMESERVER', 'TEST_CIDR_PRIV'],
'TEST_NAME_SERVER', 'TEST_CIDR_PRIV'],
'swift': ['TEST_SWIFT_IP'],
}
IGNORABLE_VARS = ['TEST_CIDR_PRIV']
TEMPEST_FLAVOR_NAME = 'm1.tempest'
TEMPEST_ALT_FLAVOR_NAME = 'm2.tempest'
TEMPEST_SVC_LIST = ['ceilometer', 'cinder', 'glance', 'heat', 'horizon',
@@ -198,7 +200,8 @@ def add_environment_var_config(ctxt, services):
if value:
ctxt[var.lower()] = value
else:
missing_vars.append(var)
if var not in IGNORABLE_VARS:
missing_vars.append(var)
if missing_vars:
raise ValueError(
("Environment variables [{}] must all be set to run this"

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

@@ -52,7 +52,9 @@ http_image = http://{{ test_swift_ip }}:80/swift/v1/images/cirros-0.3.4-x86_64-u
{% if 'neutron' in enabled_services %}
[network]
{% if test_cidr_priv %}
project_network_cidr = {{ test_cidr_priv }}
{% endif %}
public_network_id = {{ ext_net }}
dns_servers = {{ test_nameserver }}
project_networks_reachable = false

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

@@ -54,7 +54,9 @@ http_image = http://{{ test_swift_ip }}:80/swift/v1/images/cirros-0.3.4-x86_64-u
{% if 'neutron' in enabled_services %}
[network]
{% if test_cidr_priv %}
project_network_cidr = {{ test_cidr_priv }}
{% endif %}
public_network_id = {{ ext_net }}
dns_servers = {{ test_nameserver }}
project_networks_reachable = false