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

Change-Id: I09a133b5c4f6c71e10d274be1c70b7edcce1c83c

ci/roles/compute_flavor/tasks/main.yml

@@ -245,10 +245,10 @@
   openstack.cloud.compute_flavor_info:
     cloud: "{{ cloud }}"
     name: "m1.tiny"
-  register: flavor_name
+  register: flavor
 
 - name: Check output of list flavors with filter
   assert:
     that:
-      - flavor_name.openstack_flavors | length == 1
+      - flavor.openstack_flavors | length == 1
-
+      - flavor.openstack_flavors.0.name == "m1.tiny"

ci/roles/floating_ip/tasks/main.yml

@@ -145,7 +145,7 @@
     cloud: "{{ cloud }}"
     state: present
     name: ansible_server1
-    image: "{{ image }}"
+    image: "{{ image_name }}"
     flavor: m1.tiny
     nics:
         # one nic only else simple, first floating ip test does not work
@@ -175,7 +175,7 @@
     cloud: "{{ cloud }}"
     state: present
     name: ansible_server2
-    image: "{{ image }}"
+    image: "{{ image_name }}"
     flavor: m1.tiny
     nics:
       - port-name: ansible_internal_port2

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].name == "ansible_image"
-      - "image_info_result.images[0].tags | sort == image_tags | sort"
+      - 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:

ci/roles/keystone_domain/tasks/main.yml

@@ -11,7 +11,7 @@
   assert:
     that:
       - "'domain' in os_domain"
-      - os_domain.domain.name == "{{ domain_name }}"
+      - os_domain.domain.name == domain_name
       - >-
           ('enabled' in os_domain.domain.keys() and os_domain.domain['enabled']|bool) or
           ('is_enabled' in os_domain.domain and os_domain.domain['is_enabled']|bool)

ci/roles/server/defaults/main.yml

@@ -53,7 +53,7 @@ expected_fields:
   - user_id
   - vm_state
   - volumes
-flavor: m1.tiny
+flavor_name: m1.tiny
 floating_ip_pool_name: public
 server_alt_name: ansible_server_alt
 server_alt_network: ansible_server_network_alt

ci/roles/server/tasks/main.yml

@@ -60,8 +60,8 @@
     cloud: "{{ cloud }}"
     state: present
     name: "{{ server_name }}"
-    image: "{{ image }}"
+    image: "{{ image_name }}"
-    flavor: "{{ flavor }}"
+    flavor: "{{ flavor_name }}"
     network: "{{ server_network }}"
     auto_ip: false
     metadata: "key1=value1,key2=value2"
@@ -120,8 +120,8 @@
     cloud: "{{ cloud }}"
     state: present
     name: "{{ server_name }}"
-    image: "{{ image }}"
+    image: "{{ image_name }}"
-    flavor: "{{ flavor }}"
+    flavor: "{{ flavor_name }}"
     auto_ip: false
     network: "{{ server_network }}"
     metadata:
@@ -141,7 +141,7 @@
 - name: Check info about server name
   assert:
     that:
-      - info.servers[0].name == "{{ server_name }}"
+      - info.servers[0].name == server_name
       - info.servers[0].id == server.server.id
 
 - name: Filter servers
@@ -195,8 +195,8 @@
     cloud: "{{ cloud }}"
     state: present
     name: "{{ server_name }}"
-    image: "{{ image }}"
+    image: "{{ image_name }}"
-    flavor: "{{ flavor }}"
+    flavor: "{{ flavor_name }}"
     network: "private"
     floating_ip_pools:
       - "{{ floating_ip_pool_name }}"
@@ -218,7 +218,7 @@
 - name: Check info about server image name
   assert:
     that:
-      - info.servers[0].image.name == "{{ image }}"
+      - info.servers[0].image.name == image_name
   # TODO: Drop ignore_errors once openstacksdk's bug #2010135 has been solved.
   #       Ref.: https://storyboard.openstack.org/#!/story/2010135
   ignore_errors: yes
@@ -235,8 +235,8 @@
     cloud: "{{ cloud }}"
     state: present
     name: "{{ server_name }}"
-    image: "{{ image }}"
+    image: "{{ image_name }}"
-    flavor: "{{ flavor }}"
+    flavor: "{{ flavor_name }}"
     network: "{{ server_network }}"
     auto_ip: false
     boot_from_volume: true
@@ -259,8 +259,8 @@
     cloud: "{{ cloud }}"
     state: present
     name: "{{ server_name }}"
-    image: "{{ image }}"
+    image: "{{ image_name }}"
-    flavor: "{{ flavor }}"
+    flavor: "{{ flavor_name }}"
     network: "{{ server_network }}"
     auto_ip: false
     wait: true
@@ -300,8 +300,8 @@
   openstack.cloud.server:
     auto_ip: true
     cloud: "{{ cloud }}"
-    flavor: "{{ flavor }}"
+    flavor: "{{ flavor_name }}"
-    image: "{{ image }}"
+    image: "{{ image_name }}"
     name: "{{ server_name }}"
     nics:
       - net-name: "{{ server_network }}"
@@ -330,8 +330,8 @@
   openstack.cloud.server:
     auto_ip: false
     cloud: "{{ cloud }}"
-    flavor: "{{ flavor }}"
+    flavor: "{{ flavor_name }}"
-    image: "{{ image }}"
+    image: "{{ image_name }}"
     name: "{{ server_name }}"
     nics:
       - net-name: 'public'
@@ -377,8 +377,8 @@
     #       description parameter has been released to PyPI.
     #       Ref.: https://review.opendev.org/c/openstack/openstacksdk/+/850671
     #description: "This is a server"
-    flavor: "{{ flavor }}"
+    flavor: "{{ flavor_name }}"
-    image: "{{ image }}"
+    image: "{{ image_name }}"
     metadata:
       key1: value1
       key2: value2
@@ -427,9 +427,9 @@
     cloud: "{{ cloud }}"
     description: "This server got updated"
     # flavor cannot be updated but must be present
-    flavor: "{{ flavor }}"
+    flavor: "{{ flavor_name }}"
     # image cannot be updated but must be present
-    image: "{{ image }}"
+    image: "{{ image_name }}"
     metadata:
       key2: value2
       key3: value3
@@ -482,9 +482,9 @@
     cloud: "{{ cloud }}"
     description: "This server got updated"
     # flavor cannot be updated but must be present
-    flavor: "{{ flavor }}"
+    flavor: "{{ flavor_name }}"
     # image cannot be updated but must be present
-    image: "{{ image }}"
+    image: "{{ image_name }}"
     metadata:
       key2: value2
       key3: value3
@@ -515,9 +515,9 @@
     cloud: "{{ cloud }}"
     description: "This server got updated"
     # flavor cannot be updated but must be present
-    flavor: "{{ flavor }}"
+    flavor: "{{ flavor_name }}"
     # image cannot be updated but must be present
-    image: "{{ image }}"
+    image: "{{ image_name }}"
     metadata:
       key2: value2
       key3: value3

ci/roles/server/tasks/server_actions.yml

@@ -20,8 +20,8 @@
      cloud: "{{ cloud }}"
      state: present
      name: "{{ server_name }}"
-     image: "{{ image }}"
+     image: "{{ image_name }}"
-     flavor: "{{ flavor }}"
+     flavor: "{{ flavor_name }}"
      network: "{{ server_network }}"
      auto_floating_ip: false
      wait: true
@@ -397,7 +397,7 @@
   openstack.cloud.server_action:
     cloud: "{{ cloud }}"
     server: "{{ server_name }}"
-    image: "{{ image }}"
+    image: "{{ image_name }}"
     action: rebuild
     wait: true
   register: server
@@ -418,7 +418,7 @@
   openstack.cloud.server_action:
     cloud: "{{ cloud }}"
     server: "{{ server_name }}"
-    image: "{{ image }}"
+    image: "{{ image_name }}"
     action: rebuild
     wait: true
     admin_password: random
@@ -562,8 +562,8 @@
      cloud: "{{ cloud_alt }}"
      state: present
      name: "{{ server_alt_name }}"
-     image: "{{ image }}"
+     image: "{{ image_name }}"
-     flavor: "{{ flavor }}"
+     flavor: "{{ flavor_name }}"
      network: "{{ server_alt_network }}"
      auto_floating_ip: false
      wait: true

ci/roles/server_volume/tasks/main.yml

@@ -4,7 +4,7 @@
     state: present
     name: "{{ server_name }}"
     image: "cirros-0.5.2-x86_64-disk"
-    flavor: "{{ flavor }}"
+    flavor: "{{ flavor_name }}"
     network: "{{ server_network }}"
     auto_ip: false
     wait: true

ci/roles/volume/tasks/main.yml

@@ -55,7 +55,6 @@
          name: "{{ test_volume_image }}"
          filename: "{{ tmp_file.path }}"
          disk_format: raw
-         tags: "{{ image_tags }}"
 
     - name: Create volume from image
       openstack.cloud.volume:
@@ -76,21 +75,19 @@
       openstack.cloud.image:
          cloud: "{{ cloud }}"
          state: present
-         name: "{{ image_name }}"
+         name: ansible_image
          filename: "{{ tmp_file.path }}"
          is_public: true
          disk_format: raw
-         tags: "{{ image_tags }}"
 
     - name: Delete test shared image
       openstack.cloud.image:
          cloud: "{{ cloud }}"
          state: absent
-         name: "{{ image_name }}"
+         name: ansible_image
          filename: "{{ tmp_file.path }}"
          is_public: true
          disk_format: raw
-         tags: "{{ image_tags }}"
 
   always:
     - name: Remove temporary image file

ci/run-ansible-tests-collection.sh

@@ -150,5 +150,5 @@ set -o pipefail
 # shellcheck disable=SC2086
 ANSIBLE_COLLECTIONS_PATHS=$TEST_COLLECTIONS_PATHS ansible-playbook \
     -vvv ./run-collection.yml \
-    -e "sdk_version=${SDK_VER} cloud=${CLOUD} cloud_alt=${CLOUD_ALT} image=${IMAGE} ${ANSIBLE_VARS}" \
+    -e "sdk_version=${SDK_VER} cloud=${CLOUD} cloud_alt=${CLOUD_ALT} image_name=${IMAGE} ${ANSIBLE_VARS}" \
     ${tag_opt} 2>&1 | sudo tee /opt/stack/logs/test_output.log