Go back on generating libvirt hosts

Signed-off-by: Daniel Pawlik <dpawlik@redhat.com>

Author: danpawlik

roles/libvirt_manager/tasks/add_vm_to_inventory.yml

@@ -1,11 +1,11 @@
 ---
-- name: Add host to runtime inventory
-  ansible.builtin.add_host:
-    name: "{{ _full_host_name }}"
-    groups: "{{ _group }}s"
-    ansible_ssh_user: "{{ _ssh_user }}"
-    ansible_host: "{{ _add_ansible_host | ternary(_ansible_host, omit) }}"
-    vm_type: "{{ _group }}"
+#- name: Add host to runtime inventory
+#  ansible.builtin.add_host:
+#    name: "{{ _full_host_name }}"
+#    groups: "{{ _group }}s"
+#    ansible_ssh_user: "{{ _ssh_user }}"
+#    ansible_host: "{{ _add_ansible_host | ternary(_ansible_host, omit) }}"
+#    vm_type: "{{ _group }}"
 
 - name: Ensure group section exists
   ansible.builtin.lineinfile:

roles/libvirt_manager/tasks/generate_networking_data.yml

@@ -83,6 +83,52 @@
 # END MAC pre-generation management
 #
 # START generate all IPs using networking_mapper role/module
+- name: Inject all VMs in the inventory
+  when:
+    - (_cifmw_libvirt_manager_layout.vms[_vm_type].amount | default(1) | int) > 0
+  vars:
+    _vm_type: "{{ cifmw_libvirt_manager_all_vms[item.key] | default('none') }}"
+    _std_group: "{{ (_vm_type == 'crc') | ternary('ocp', _vm_type) }}"
+    _group: >-
+      {{
+        (cifmw_baremetal_hosts is defined and
+         cifmw_baremetal_hosts[item.key] is defined) |
+        ternary('baremetal', _std_group)
+      }}
+    _ocp_name: >-
+      {{
+        item.key | replace('_', '-') |
+        replace('ocp-', '')
+      }}
+    _hostname: >-
+      {{
+        (item.key is match('^ocp.*')) |
+        ternary(_ocp_name, item.key) |
+        replace('_', '-')
+      }}
+    _ssh_user: >-
+      {{
+        _cifmw_libvirt_manager_layout.vms[_vm_type].admin_user |
+        default(_cifmw_libvirt_manager_layout.vms[_vm_type].user) |
+        default('zuul')
+      }}
+    _add_ansible_host: >-
+      {{
+        _cifmw_libvirt_manager_layout.vms[_vm_type].manage | default(true) and
+        _cifmw_libvirt_manager_layout.vms[_vm_type].disk_file_name | default(_vm_type is not none) != 'blank'
+      }}
+    _ansible_host: "{{ _hostname }}.{{ inventory_hostname }}"
+  ansible.builtin.add_host:
+    name: "{{ item.key | replace('_', '-') }}"
+    groups: "{{ _group }}s"
+    ansible_ssh_user: "{{ _ssh_user }}"
+    ansible_host: "{{ _add_ansible_host | ternary(_ansible_host, omit) }}"
+    vm_type: "{{ _group }}"
+  loop: "{{ cifmw_libvirt_manager_mac_map | dict2items }}"
+  loop_control:
+    label: "Adding {{ item.key }} to {{ _group }}s"
+
+##
 - name: Inject all VMs in the inventory
   when:
     - (_cifmw_libvirt_manager_layout.vms[_vm_type].amount | default(1) | int) > 0
@@ -141,6 +187,7 @@
     -i {{ cifmw_libvirt_manager_tmp_inv_file }}
     -y --list > {{ cifmw_libvirt_manager_dst_inv_file }}
 
+
 - name: Generate all IPs based on MAC and networks
   vars:
     cifmw_networking_mapper_ifaces_info: >-

roles/networking_mapper/tasks/_gather_facts.yml

@@ -53,6 +53,7 @@
       when: "'ansible_host' in _instance_vars"
       ansible.builtin.setup:
         gather_subset:
+          - min
           - network
           - platform
       delegate_to: "{{ item }}"

roles/networking_mapper/tasks/load_env_definition.yml

@@ -1,7 +1,13 @@
 ---
 - name: Load the Network Environment Definition from file if not given
-  when: "cifmw_networking_env_definition is not defined"
+#  when: "cifmw_networking_env_definition is not defined"
   block:
+    - name: Print current cifmw_networking_env_definition if defined - daniel
+      when: "cifmw_networking_env_definition is defined"
+      ansible.builtin.debug:
+        msg: |
+          {{ cifmw_networking_env_definition }}
+
     - name: Check for Networking Environment Definition file existence
       ansible.builtin.stat:
         path: "{{ cifmw_networking_mapper_networking_env_def_path }}"