dt-dcn: Make VM's names of DCN compute grouos not to be substring of each other.

The reason is to workaround a bug in neutron

Author: krcmarik

playbooks/dcn.yml

@@ -68,8 +68,8 @@
       ansible.builtin.set_fact:
         az_to_group_map:
           az0: computes
-          az1: dcn1-computes
-          az2: dcn2-computes
+          az1: dcn1-compute-az1s
+          az2: dcn2-compute-az2s
 
     - name: Scaledown the DCN site
       vars:

roles/reproducer/tasks/libvirt_layout.yml

@@ -99,8 +99,8 @@
       (compute.key in (groups['computes'] | default([]))) or
       (compute.key in (groups['cephs'] | default([]))) or
       (compute.key in (groups['networkers'] | default([]))) or
-      (compute.key in (groups['dcn1-computes'] | default([]))) or
-      (compute.key in (groups['dcn2-computes'] | default([]))) or
+      (compute.key in (groups['dcn1-compute-az1s'] | default([]))) or
+      (compute.key in (groups['dcn2-compute-az2s'] | default([]))) or
       (compute.key is match('^r[0-9]-compute-.*')) or
       (compute.key is match('^r[0-9]-networker-.*'))
   vars:

scenarios/reproducers/dt-dcn.yml

@@ -142,7 +142,7 @@ cifmw_libvirt_manager_configuration:
       nets:
         - ocpbm
         - osp_trunk
-    dcn1-compute:
+    dcn1-compute-az1:
       uefi: "{{ cifmw_use_uefi }}"
       root_part_id: "{{ cifmw_root_partition_id }}"
       amount: "{{ [cifmw_libvirt_manager_compute_amount|int, 3] | max }}"
@@ -158,7 +158,7 @@ cifmw_libvirt_manager_configuration:
       nets:
         - dcn1_pb
         - dcn1_tr
-    dcn2-compute:
+    dcn2-compute-az2:
       uefi: "{{ cifmw_use_uefi }}"
       root_part_id: "{{ cifmw_root_partition_id }}"
       amount: "{{ [cifmw_libvirt_manager_compute_amount|int, 3] | max }}"
@@ -470,7 +470,7 @@ cifmw_networking_definition:
           trunk-parent: ctlplane
         storagemgmt:
           trunk-parent: ctlplane
-    dcn1-computes:
+    dcn1-compute-az1s:
       network-template:
         range:
           start: 111
@@ -485,7 +485,7 @@ cifmw_networking_definition:
           trunk-parent: ctlplanedcn1
         storagemgmtdcn1:
           trunk-parent: ctlplanedcn1
-    dcn2-computes:
+    dcn2-compute-az2s:
       network-template:
         range:
           start: 121