From f4c150f3e70e71dfba4d039b90655bd3e93c37f2 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Thu, 23 Apr 2020 15:23:49 +0000
Subject: [PATCH] restore templates

---
 .../tempest/templates/tempest_v2.py           | 96 ++++++++++++++++++-
 .../tempest/templates/tempest_v3.py           | 94 +++++++++++++++++-
 2 files changed, 188 insertions(+), 2 deletions(-)

diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py
index aa6b555..ec95577 100644
--- a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py
+++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.py
@@ -1,3 +1,97 @@
 file_contents = """
 [DEFAULT]
-debug = false"""
+debug = false
+use_stderr = false
+log_file = tempest.log
+
+[auth]
+test_accounts_file = accounts.yaml
+default_credentials_domain_name = Default
+admin_username = {admin_username}
+admin_project_name = admin
+admin_password = {admin_password}
+admin_domain_name = Default
+
+[compute]
+image_ref = {image_id}
+image_ref_alt = {image_alt_id}
+flavor_ref = {flavor_ref}
+flavor_ref_alt = {flavor_ref_alt}
+region = RegionOne
+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
+
+[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
+# NOTE(coreycb): Need to enalbe catalog_type, determined by:
+# volume_version=$(openstack endpoint list -c 'Service Type' -f value | grep -m 1 volumev3 ||
+#                  openstack endpoint list -c 'Service Type' -f value | grep -m 1 volumev2)
+# catalog_type = __VOLUME_VERSION__
+
+[volume-feature-enabled]
+backup = false"""
diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py
index aa6b555..887b0b5 100644
--- a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py
+++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.py
@@ -1,3 +1,95 @@
 file_contents = """
 [DEFAULT]
-debug = false"""
+debug = false
+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
+uri_v3 = {proto}://{keystone}:5000/v3
+auth_version = v3
+admin_role = Admin
+region = RegionOne
+default_domain_id = {default_domain_id}
+admin_domain_scope = true
+
+[identity-feature-enabled]
+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
+
+[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"""