From bdc2e96e93339a2fa3ec5a292ce90288de9118b6 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 9 Jun 2020 14:22:26 +0000 Subject: [PATCH] Drop OS_ prefix from SETUP_ENV_VARS --- zaza/openstack/charm_tests/tempest/setup.py | 12 ++++++------ .../charm_tests/tempest/templates/tempest_v2.py | 6 +++--- .../charm_tests/tempest/templates/tempest_v3.py | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/zaza/openstack/charm_tests/tempest/setup.py b/zaza/openstack/charm_tests/tempest/setup.py index e6d7295..4266ddc 100644 --- a/zaza/openstack/charm_tests/tempest/setup.py +++ b/zaza/openstack/charm_tests/tempest/setup.py @@ -27,12 +27,12 @@ import zaza.openstack.charm_tests.tempest.templates.tempest_v3 as tempest_v3 import zaza.openstack.charm_tests.tempest.templates.accounts as accounts SETUP_ENV_VARS = [ - 'OS_TEST_GATEWAY', - 'OS_TEST_CIDR_EXT', - 'OS_TEST_FIP_RANGE', - 'OS_TEST_NAMESERVER', - 'OS_TEST_CIDR_PRIV', - 'OS_TEST_SWIFT_IP', + 'TEST_GATEWAY', + 'TEST_CIDR_EXT', + 'TEST_FIP_RANGE', + 'TEST_NAMESERVER', + 'TEST_CIDR_PRIV', + 'TEST_SWIFT_IP', ] TEMPEST_FLAVOR_NAME = 'm1.tempest' TEMPEST_ALT_FLAVOR_NAME = 'm2.tempest' diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py index c5649d0..8b0f939 100644 --- a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py +++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py @@ -44,12 +44,12 @@ api_v2 = true api_v3 = false [image] -http_image = http://{os_test_swift_ip}:80/swift/v1/images/cirros-0.3.4-x86_64-uec.tar.gz +http_image = http://{test_swift_ip}:80/swift/v1/images/cirros-0.3.4-x86_64-uec.tar.gz [network] -project_network_cidr = {os_test_cidr_priv} +project_network_cidr = {test_cidr_priv} public_network_id = {ext_net} -dns_servers = {os_test_nameserver} +dns_servers = {test_nameserver} project_networks_reachable = false [network-feature-enabled] diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py index 4f183dd..5140deb 100644 --- a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py +++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py @@ -46,12 +46,12 @@ api_v2 = false api_v3 = true [image] -http_image = http://{os_test_swift_ip}:80/swift/v1/images/cirros-0.3.4-x86_64-uec.tar.gz +http_image = http://{test_swift_ip}:80/swift/v1/images/cirros-0.3.4-x86_64-uec.tar.gz [network] -project_network_cidr = {os_test_cidr_priv} +project_network_cidr = {test_cidr_priv} public_network_id = {ext_net} -dns_servers = {os_test_nameserver} +dns_servers = {test_nameserver} project_networks_reachable = false floating_network_name = {ext_net}