Merge "Add zun service to tempest"

defaults/main.yml

@@ -192,6 +192,7 @@ tempest_service_available_octavia: "{{ groups['octavia_all'] is defined and grou
 tempest_service_available_sahara: "{{ groups['sahara_all'] is defined and groups['sahara_all'] | length > 0 }}"
 tempest_service_available_swift: "{{ (groups['swift_all'] is defined and groups['swift_all'] | length > 0) or (groups['ceph-rgw'] is defined and groups['ceph-rgw'] | length > 0) or (ceph_rgws is defined and ceph_rgws | length > 0) }}"
 tempest_service_available_zaqar: "{{ groups['zaqar_all'] is defined and groups['zaqar_all'] | length > 0 }}"
+tempest_service_available_zun: "{{ groups['zun_all'] is defined and groups['zun_all'] | length > 0 }}"
 
 tempest_image_api_v1_enabled: False
 tempest_image_api_v2_enabled: True

templates/tempest.conf.j2

@@ -153,6 +153,7 @@ sahara = {{ tempest_service_available_sahara }}
 zaqar = {{ tempest_service_available_zaqar }}
 manila = {{ tempest_service_available_manila }}
 murano = {{ tempest_service_available_murano }}
+zun = {{ tempest_service_available_zun }}
 
 [telemetry]
 endpoint_type = internalURL

vars/main.yml

@@ -156,3 +156,8 @@ _tempest_plugins:
       repo: https://opendev.org/openstack/zaqar-tempest-plugin
       branch: master
       install: "{{ tempest_service_available_zaqar | bool }}"
+  zun:
+    - name: zun-tempest-plugin
+      repo: https://opendev.org/openstack/zun-tempest-plugin
+      branch: master
+      install: "{{ tempest_service_available_zun | bool }}"