From 41bc9e00692a18f9f0ec0d7d78a886fcf4e874fb Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Wed, 18 May 2022 20:53:37 +0000
Subject: [PATCH] Add manila support to tempest

---
 .../charm_tests/tempest/templates/tempest_v3.j2       | 11 ++++++++++-
 zaza/openstack/charm_tests/tempest/utils.py           |  4 ++--
 2 files changed, 12 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 5cb65edaf..91c69a71b 100644
--- a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
+++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
@@ -10,6 +10,15 @@ admin_project_name = {{ admin_project_name }}
 admin_password = {{ admin_password }}
 admin_domain_name = {{ admin_domain_name }}
 
+{% if 'manila' in enabled_services %}
+[share]
+multitenancy_enabled = false
+capability_snapshot_support = true
+enable_protocols = nfs
+capability_storage_protocol = NFS
+max_api_microversion = 2.63
+{% endif %}
+
 {% if 'nova' in enabled_services %}
 [compute]
 image_ref = {{ image_id }}
@@ -110,4 +119,4 @@ backup = false
 enable_security_groups = true
 test_with_ipv6 = false
 test_server_path = {{ workspace_path }}/test_server.bin
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/zaza/openstack/charm_tests/tempest/utils.py b/zaza/openstack/charm_tests/tempest/utils.py
index 830600ec2..fa6c05115 100644
--- a/zaza/openstack/charm_tests/tempest/utils.py
+++ b/zaza/openstack/charm_tests/tempest/utils.py
@@ -38,8 +38,8 @@
 TEMPEST_FLAVOR_NAME = 'm1.tempest'
 TEMPEST_ALT_FLAVOR_NAME = 'm2.tempest'
 TEMPEST_SVC_LIST = ['ceilometer', 'cinder', 'glance', 'heat', 'horizon',
-                    'ironic', 'neutron', 'nova', 'octavia', 'sahara', 'swift',
-                    'trove', 'zaqar']
+                    'ironic', 'manila', 'neutron', 'nova', 'octavia',
+                    'sahara', 'swift', 'trove', 'zaqar']
 
 
 def render_tempest_config_keystone_v2():