Merge "DEFCORE: Updated tempest config and resources"

playbooks/roles/os_tempest/tasks/tempest_resources.yml

@@ -27,13 +27,34 @@
     - tempest-setup
     - tempest-config
 
-- name: Store glance image id
+- name: Store cirros image id
   set_fact:
     tempest_glance_image_id: "{{ glance_images.cirros.id }}"
   tags:
     - tempest-setup
     - tempest-config
 
+- name: Ensure alt cirros image
+  glance:
+    command: 'image-create'
+    openrc_path: /root/openrc
+    image_name: cirros_alt
+    image_url: "{{ cirros_img_url }}"
+    image_container_format: bare
+    image_disk_format: qcow2
+    image_is_public: True
+    insecure: "{{ keystone_service_internaluri_insecure }}"
+  tags:
+    - tempest-setup
+    - tempest-config
+
+- name: Store alt cirros image id
+  set_fact:
+    tempest_glance_image_alt_id: "{{ glance_images.cirros_alt.id }}"
+  tags:
+    - tempest-setup
+    - tempest-config
+
 - name: Ensure tempest tenants
   keystone:
     command: ensure_tenant

playbooks/roles/os_tempest/templates/tempest.conf.j2

@@ -35,7 +35,7 @@ timeout = 15
 
 [compute]
 image_ref = {{ tempest_glance_image_id }}
-image_ref_alt = {{ tempest_glance_image_id }}
+image_ref_alt = {{ tempest_glance_image_alt_id }}
 flavor_ref = 201
 flavor_ref_alt = 202
 image_ssh_user = {{ tempest_compute_image_ssh_user }}
@@ -147,7 +147,7 @@ reseller_admin_role = reseller_admin
 [object-storage-feature-enabled]
 container_sync = {{ tempest_swift_container_sync }}
 object_versioning = {{ tempest_swift_object_versioning }}
-discoverable_apis = {{ tempest_swift_discoverable_apis | join(' ') }}
+discoverable_apis = {{ tempest_swift_discoverable_apis | join(',') }}
 
 
 [orchestration]