Renamed image->image_name and flavor->flavor_name to avoid collisions

Change-Id: I09a133b5c4f6c71e10d274be1c70b7edcce1c83c

ci/roles/image/defaults/main.yml

@@ -1,7 +1,3 @@
-image_name: ansible_image
-image_tags:
-  - test
-  - ansible
 expected_fields:
   - architecture
   - checksum

ci/roles/image/tasks/main.yml

@@ -3,7 +3,7 @@
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: absent
-     name: "{{ image_name }}"
+     name: ansible_image
 
 - name: Create a test image file
   shell: mktemp
@@ -27,11 +27,13 @@
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: present
-     name: "{{ image_name }}"
+     name: ansible_image
      filename: "{{ tmp_file.stdout }}"
      is_protected: true
      disk_format: raw
-     tags: "{{ image_tags }}"
+     tags:
+       - test
+       - ansible
   register: returned_image
 
 - debug:
@@ -50,24 +52,26 @@
 - name: Get details of created image
   openstack.cloud.image_info:
     cloud: "{{ cloud }}"
-    image: "{{ image_name }}"
+    image: ansible_image
   register: image_info_result
 
 - name: Verify image info
   assert:
     that:
-      - "image_info_result.images[0].name == image_name"
-      - "image_info_result.images[0].tags | sort == image_tags | sort"
+      - image_info_result.images[0].name == "ansible_image"
+      - image_info_result.images[0].tags | sort == ['test', 'ansible'] | sort
 
 - name: Create raw image again (defaults)
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: present
-     name: "{{ image_name }}"
+     name: ansible_image
      filename: "{{ tmp_file.stdout }}"
      is_protected: true
      disk_format: raw
-     tags: "{{ image_tags }}"
+     tags:
+       - test
+       - ansible
   register: returned_image
 
 - name: Assert not changed
@@ -84,7 +88,7 @@
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: present
-     name: "{{ image_name }}"
+     name: ansible_image
      is_protected: false
   register: returned_image
 
@@ -103,7 +107,7 @@
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: present
-     name: "{{ image_name }}"
+     name: ansible_image
      is_public: false
   register: returned_image
 
@@ -116,7 +120,7 @@
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: present
-     name: "{{ image_name }}"
+     name: ansible_image
      is_public: true
   register: returned_image
 
@@ -130,7 +134,7 @@
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: present
-     name: "{{ image_name }}"
+     name: ansible_image
      visibility: shared
   register: returned_image
 
@@ -145,28 +149,28 @@
      cloud: "{{ cloud }}"
      state: present
      id: "{{ returned_image.id }}"
-     name: "{{ image_name }}-changed"
+     name: 'ansible_image-changed'
   register: returned_image
 
 - name: Assert changed
   assert:
     that:
       - returned_image is changed
-      - returned_image.image.name == "{{ image_name }}-changed"
+      - returned_image.image.name == 'ansible_image-changed'
 
 - name: Rename back raw image (defaults)
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: present
      id: "{{ returned_image.id }}"
-     name: "{{ image_name }}"
+     name: ansible_image
   register: returned_image
 
 - name: Delete raw image (defaults)
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: absent
-     name: "{{ image_name }}"
+     name: ansible_image
   register: returned_image
 
 - name: assert image changed
@@ -177,7 +181,7 @@
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: absent
-     name: "{{ image_name }}"
+     name: ansible_image
   register: returned_image
 
 - name: assert image not changed
@@ -188,7 +192,7 @@
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: present
-     name: "{{ image_name }}"
+     name: ansible_image
      filename: "{{ tmp_file.stdout }}"
      disk_format: raw
      is_public: True
@@ -216,12 +220,12 @@
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: absent
-     name: "{{ image_name }}"
+     name: ansible_image
 
 - name: Try to get details of deleted image
   openstack.cloud.image_info:
     cloud: "{{ cloud }}"
-    image: "{{ image_name }}"
+    image: ansible_image
   register: deleted_image_info_result
 
 - name: Verify image is deleted
@@ -243,17 +247,19 @@
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: present
-     name: "{{ image_name }}"
+     name: ansible_image
      filename: "{{ tmp_file.stdout }}"
      disk_format: raw
-     tags: "{{ image_tags }}"
+     tags:
+       - test
+       - ansible
      project: image_owner_project
   register: returned_image
 
 - name: Get details of created image (owner by project name)
   openstack.cloud.image_info:
     cloud: "{{ cloud }}"
-    image: "{{ image_name }}"
+    image: ansible_image
   register: image_info_result
 
 - name: Verify image owner (owner by project name)
@@ -265,16 +271,18 @@
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: absent
-     name: "{{ image_name }}"
+     name: ansible_image
 
 - name: Create raw image (owner by project name and domain name)
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: present
-     name: "{{ image_name }}"
+     name: ansible_image
      filename: "{{ tmp_file.stdout }}"
      disk_format: raw
-     tags: "{{ image_tags }}"
+     tags:
+       - test
+       - ansible
      project: image_owner_project
      project_domain: default
   register: returned_image
@@ -282,7 +290,7 @@
 - name: Get details of created image (owner by project name and domain name)
   openstack.cloud.image_info:
     cloud: "{{ cloud }}"
-    image: "{{ image_name }}"
+    image: ansible_image
   register: image_info_result
 
 - name: Verify image owner (owner by project name and domain name)
@@ -294,7 +302,7 @@
   openstack.cloud.image:
      cloud: "{{ cloud }}"
      state: absent
-     name: "{{ image_name }}"
+     name: ansible_image
 
 - name: Delete owner project
   openstack.cloud.project: