From 522d3e53b8d87c05d64fbbb8722c861cdd52638d Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Fri, 25 Sep 2020 10:39:13 +0200 Subject: [PATCH] Only configure private Neutron CIDR if it is configured --- zaza/openstack/charm_tests/tempest/setup.py | 7 +++++-- zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2 | 2 ++ zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2 | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/zaza/openstack/charm_tests/tempest/setup.py b/zaza/openstack/charm_tests/tempest/setup.py index 98ea327..5c85d9c 100644 --- a/zaza/openstack/charm_tests/tempest/setup.py +++ b/zaza/openstack/charm_tests/tempest/setup.py @@ -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" diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2 b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2 index 83a05ca..8c9b6c6 100644 --- a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2 +++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2 @@ -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 diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2 b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2 index 0ed401a..fc92dd2 100644 --- a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2 +++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2 @@ -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