Gather VMs facts

Signed-off-by: Daniel Pawlik <[email protected]>

Author: danpawlik

reproducer.yml

@@ -84,68 +84,11 @@
       ansible.builtin.import_role:
         name: reproducer
 
-    #######
-    - name: Get vars
-      copy:
-        content: |
-          {{ vars }}
-        dest: "{{ ansible_user_dir }}/daniel-vars"
-      ignore_errors: true
-      no_log: true
-
-    - name: Get environment
-      copy:
-        content: |
-          {{ environment }}
-        dest: "{{ ansible_user_dir }}/daniel-environment"
-      ignore_errors: true
-      no_log: true
-
-    - name: Get group_names
-      copy:
-        content: |
-          {{ group_names }}
-        dest: "{{ ansible_user_dir }}/daniel-group_names"
-      ignore_errors: true
-      no_log: true
-
-    - name: Get groups
-      copy:
-        content: |
-          {{ groups }}
-        dest: "{{ ansible_user_dir }}/daniel-groups"
-      ignore_errors: true
-      no_log: true
-
-    - name: Get hostvars
-      copy:
-        content: |
-          {{ hostvars }}
-        dest: "{{ ansible_user_dir }}/daniel-hostvars"
-      ignore_errors: true
-      no_log: true
-
-
     - name: Finish playbook if prepare environment executed
       when:
         - cifmw_deploy_reproducer_env | default(false) | bool
       ansible.builtin.meta: end_play
 
-    # Temporary
-    - name: Check if libvirt inventory file exists
-      ansible.builtin.stat:
-        path: "{{ ansible_user_dir }}/libvirt_inventory.yaml"
-      register: _libvirt_inventory
-
-    - name: Read inventory file and add it using add_host module
-      when: _libvirt_inventory.stat.exists
-      vars:
-        include_inventory_file: "{{ ansible_user_dir }}/libvirt_inventory.yaml"
-      ansible.builtin.include_role:
-        name: cifmw_helpers
-        tasks_from: inventory_file.yml
-    #
-
     - name: Allow traffic from OSP VMs to OSP API (needed for shiftstack)
       become: true
       when: cifmw_allow_vms_to_reach_osp_api | default (false) | bool

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,52 +83,6 @@
 # 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"
-
-## daniel
 - name: Inject all VMs in the inventory
   when:
     - (_cifmw_libvirt_manager_layout.vms[_vm_type].amount | default(1) | int) > 0
@@ -186,7 +140,6 @@
     ansible-inventory
     -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:

roles/networking_mapper/tasks/load_env_definition.yml

@@ -33,9 +33,3 @@
             from_yaml
           }}
         cacheable: true
-
-- name: Daniel - print current cifmw_networking_env_definition if defined
-  when: "cifmw_networking_env_definition is defined"
-  ansible.builtin.debug:
-    msg: |
-      {{ cifmw_networking_env_definition }}

roles/reproducer/tasks/configure_controller.yml

@@ -474,6 +474,10 @@
         cifmw_networking_mapper_network_name: >-
           {{ _cifmw_libvirt_manager_layout.vms.controller.nets.1 }}
         cifmw_networking_mapper_basedir: "{{ cifmw_reproducer_controller_basedir }}"
+        # NOTE(dpawlik): Without gathering facts here, on executing reproducer
+        # playbook via Zironic or locally, the /etc/ci/env/networking-environment-definition.yml
+        # in later state will not contain: "hostname" and "interface_name" keys,
+        # which would fail on generating network-values using ci_gen_kustomize_values.
         cifmw_networking_mapper_gather_facts: true
       ansible.builtin.import_role:
         name: networking_mapper