From eff595c6ee7d50adb8702908ec979889d33f6d82 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Mon, 9 Mar 2020 13:54:04 +0000 Subject: [PATCH] Add render_tempest_config_keystone_v2 for older deployments --- zaza/openstack/charm_tests/tempest/setup.py | 5 + .../tempest/templates/tempest_v2.py | 94 +++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 zaza/openstack/charm_tests/tempest/templates/tempest_v2.py diff --git a/zaza/openstack/charm_tests/tempest/setup.py b/zaza/openstack/charm_tests/tempest/setup.py index cc344ba..2fd95f4 100644 --- a/zaza/openstack/charm_tests/tempest/setup.py +++ b/zaza/openstack/charm_tests/tempest/setup.py @@ -21,6 +21,7 @@ import zaza.model import zaza.utilities.deployment_env as deployment_env import zaza.openstack.utilities.openstack as openstack_utils import zaza.openstack.charm_tests.glance.setup as glance_setup +import zaza.openstack.charm_tests.tempest.templates.tempest_v2 as tempest_v2 import zaza.openstack.charm_tests.tempest.templates.tempest_v3 as tempest_v3 import zaza.openstack.charm_tests.tempest.templates.accounts as accounts @@ -161,6 +162,10 @@ def setup_tempest(tempest_template, accounts_template): accounts_template) +def render_tempest_config_keystone_v2(): + setup_tempest(tempest_v2, accounts) + + def render_tempest_config_keystone_v3(): setup_tempest(tempest_v3, accounts) diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py new file mode 100644 index 0000000..3421910 --- /dev/null +++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py @@ -0,0 +1,94 @@ +file_contents = """ +[DEFAULT] +debug = true +use_stderr = false +log_file = tempest.log + +[auth] +test_accounts_file = accounts.yaml +default_credentials_domain_name = {default_credentials_domain_name} +admin_username = {admin_username} +admin_project_name = {admin_project_name} +admin_password = {admin_password} +admin_domain_name = {admin_domain_name} + +[compute] +image_ref = {image_id} +image_ref_alt = {image_alt_id} +flavor_ref = {flavor_ref} +flavor_ref_alt = {flavor_ref_alt} +min_compute_nodes = 3 + +# TODO: review this as its release specific +# min_microversion = 2.2 +# max_microversion = latest + +[compute-feature-enabled] +console_output = true +resize = true +live_migration = true +block_migration_for_live_migration = true +attach_encrypted_volume = false + +[identity] +uri = {proto}://{keystone}:5000/v2.0 +auth_version = v2 +admin_role = Admin +region = RegionOne +default_domain_id = {default_domain_id} +admin_domain_scope = true + +[identity-feature-enabled] +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 + +[network] +project_network_cidr = {os_test_cidr_priv} +public_network_id = {ext_net} +dns_servers = {os_test_nameserver} +project_networks_reachable = false + +[network-feature-enabled] +ipv6 = false + +[orchestration] +stack_owner_role = Admin +instance_type = m1.small +keypair_name = testkey + +[oslo_concurrency] +lock_path = /tmp + +[scenario] +img_dir = /home/ubuntu/images +img_file = cirros-0.3.4-x86_64-disk.img +img_container_format = bare +img_disk_format = qcow2 + +[validation] +run_validation = true +image_ssh_user = cirros + +[service_available] +ceilometer = true +cinder = true +glance = true +heat = true +horizon = true +ironic = false +neutron = true +nova = true +sahara = false +swift = true +trove = false +zaqar = false + +[volume] +backend_names = cinder-ceph +storage_protocol = ceph + +[volume-feature-enabled] +backup = false"""