From f1081a860b852140a0d4d7aed7cc5079cbe44f55 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Tue, 31 Oct 2023 20:51:31 +0000
Subject: [PATCH 1/2] Add new heat_plugin section to tempest.conf

The heat tepest tests have moved out of tempest proper into a plugin.
This updates the tempest.conf accordingly.
---
 .../tempest/templates/tempest_v3.j2           | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2 b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
index 6b54792..d14f451 100644
--- a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
+++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
@@ -77,10 +77,29 @@ port_security = true
 {% endif %}
 
 {% if 'heat' in enabled_services %}
-[orchestration]
-stack_owner_role = Admin
-instance_type = m1.small
+[heat_plugin]
 keypair_name = testkey
+username = demo
+password = password
+project_name = demoProject
+user_domain_name = demoDomain
+project_domain_name = demoDomain
+admin_username = {{ admin_username }}
+admin_password = {{ admin_password }}
+admin_project_name = {{ admin_project_name }}
+admin_user_domain_name = admin_domain
+admin_project_domain_name = admin_domain
+auth_url = {{ proto }}://{{ keystone }}:5000//v3
+auth_version = 3
+disable_ssl_certificate_validation = true
+ca_file=/home/ubuntu/.cache/openstack-root-ca.crt
+region = RegionOne
+instance_type = m1.small
+minimal_instance_type = m1.small
+image_ref = {{ image_id }}
+minimal_image_ref = {{ image_id }}
+skip_functional_test_list = LoadBalancerv2Test,NotificationTest,UpdateStackTest.test_stack_update_with_replacing_userdata,CancelUpdateTest.test_cancel_update_server_with_port
+skip_scenario_test_list = SoftwareConfigIntegrationTest,AutoscalingLoadBalancerTest,AutoscalingLoadBalancerv2Test,AodhAlarmTest,CfnInitIntegrationTest,BasicResourcesTest
 {% endif %}
 
 [oslo_concurrency]

From c16c0f95c7c02151548d62f7a3f0eb4987a32238 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Fri, 3 Nov 2023 14:07:30 +0000
Subject: [PATCH 2/2] Clean up [heat_plugin] section

---
 zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2 | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2 b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
index d14f451..370f190 100644
--- a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
+++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
@@ -87,19 +87,16 @@ project_domain_name = demoDomain
 admin_username = {{ admin_username }}
 admin_password = {{ admin_password }}
 admin_project_name = {{ admin_project_name }}
-admin_user_domain_name = admin_domain
-admin_project_domain_name = admin_domain
+admin_domain_name = {{ admin_domain_name }}
 auth_url = {{ proto }}://{{ keystone }}:5000//v3
 auth_version = 3
 disable_ssl_certificate_validation = true
-ca_file=/home/ubuntu/.cache/openstack-root-ca.crt
 region = RegionOne
 instance_type = m1.small
 minimal_instance_type = m1.small
 image_ref = {{ image_id }}
 minimal_image_ref = {{ image_id }}
-skip_functional_test_list = LoadBalancerv2Test,NotificationTest,UpdateStackTest.test_stack_update_with_replacing_userdata,CancelUpdateTest.test_cancel_update_server_with_port
-skip_scenario_test_list = SoftwareConfigIntegrationTest,AutoscalingLoadBalancerTest,AutoscalingLoadBalancerv2Test,AodhAlarmTest,CfnInitIntegrationTest,BasicResourcesTest
+vm_to_heat_api_insecure = True
 {% endif %}
 
 [oslo_concurrency]