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

Change-Id: I09a133b5c4f6c71e10d274be1c70b7edcce1c83c

ci/roles/server/tasks/main.yml

@@ -60,8 +60,8 @@
     cloud: "{{ cloud }}"
     state: present
     name: "{{ server_name }}"
-    image: "{{ image }}"
-    flavor: "{{ flavor }}"
+    image: "{{ image_name }}"
+    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 }}"
-    flavor: "{{ flavor }}"
+    image: "{{ image_name }}"
+    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 }}"
-    flavor: "{{ flavor }}"
+    image: "{{ image_name }}"
+    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 }}"
-    flavor: "{{ flavor }}"
+    image: "{{ image_name }}"
+    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 }}"
-    flavor: "{{ flavor }}"
+    image: "{{ image_name }}"
+    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 }}"
-    image: "{{ image }}"
+    flavor: "{{ flavor_name }}"
+    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 }}"
-    image: "{{ image }}"
+    flavor: "{{ flavor_name }}"
+    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 }}"
-    image: "{{ image }}"
+    flavor: "{{ flavor_name }}"
+    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 }}"
-     flavor: "{{ flavor }}"
+     image: "{{ image_name }}"
+     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 }}"
-     flavor: "{{ flavor }}"
+     image: "{{ image_name }}"
+     flavor: "{{ flavor_name }}"
      network: "{{ server_alt_network }}"
      auto_floating_ip: false
      wait: true