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

Drop OS_ prefix from SETUP_ENV_VARS

Browse Source
This commit is contained in:
Corey Bryant
2020-06-09 14:22:26 +00:00
parent 7f6ed4665d
commit bdc2e96e93
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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'

6
zaza/openstack/charm_tests/tempest/templates/tempest_v2.py
View File

@@ -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]

6
zaza/openstack/charm_tests/tempest/templates/tempest_v3.py
View File

@@ -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}