Edits from review

Author: Ubuntu

etc/kayobe/ansible/filter_plugins/filters.py

@@ -1,4 +1,4 @@
-#!usr/bin/env python3
+#!/usr/bin/env python3
 
 from ansible.errors import AnsibleFilterError
 
@@ -12,6 +12,11 @@ def filters(self):
         }
 
     def group_hostvars_by_var(self, hostvars, var, stdout=None):
+        """
+        Returns a dictionary where the keys are values for the
+        specified var in hostvars, and the values are the hosts
+        that match that value.
+        """
         result = {}
 
         for host in hostvars.keys():
@@ -20,36 +25,34 @@ def group_hostvars_by_var(self, hostvars, var, stdout=None):
                 indiv_host_var = indiv_host_all[var]
                 if stdout is not None:
                     indiv_host_var = indiv_host_var[stdout]
-                if indiv_host_var not in result.keys():
-                    result[indiv_host_var] = [host]
-                else:
-                    result[indiv_host_var].append(host)
+                result.setdefault(indiv_host_var, []).append(host)
             except KeyError as e:
-                raise AnsibleFilterError(f"Variable {var} not found in hostvars: {e}")
+                raise AnsibleFilterError(f"Variable {var} not found for host {host} in hostvars: {e}")
 
         return result
 
-    def group_hostvars_by_host(self, hostvars, var, stdout=None, hosts=None):
+    def group_hostvars_by_host(self, hostvars, var, stdout=None, hostgroup=None):
         result = {}
-
-        ### Currently returns blank dict, try block doesn't appear to be working
-
-        if not hosts:
-            hosts = hostvars.keys()
-
-        for host in hosts:
+        """
+        Returns a dictionary where the keys are hosts and the values
+        are the values for the specified var in hostvars. If hosts is
+        specified, only those hosts are included.
+        """
+        for host in hostvars.keys():
             try:
                 indiv_host_vars = hostvars[host][var]
+                for key in indiv_host_vars.keys():
+                    if key == "skipped":
+                        return {}
                 if stdout is not None:
-                    indiv_host_vars = indiv_host_vars['stdout_lines']
+                    indiv_host_vars = indiv_host_vars[stdout]
                 if indiv_host_vars:
                     result[host] = indiv_host_vars
                 else:
                     result[host] = []
 
             except KeyError as e:
-                AnsibleFilterError(f"Host {host} not found in hostvars.keys(): {e}")
-                
+                raise AnsibleFilterError(f"Variable {var} not found for host {host} in hostvars: {e}")                
 
         return result                
 

etc/kayobe/ansible/get-cloud-facts.yml

@@ -3,27 +3,11 @@
   hosts: localhost
   gather_facts: true
   tasks:
-    - name: Check if kolla_neutron_ml2_mechanism_drivers is defined
-      ansible.builtin.set_fact:
-        kolla_neutron_ml2_mechanism_drivers_defined: "{{ kolla_neutron_ml2_mechanism_drivers is defined }}"
     - name: Check if ngs enabled
       ansible.builtin.set_fact:
         ngs_enabled: >-
-          {{ 'genericswitch' in kolla_neutron_ml2_mechanism_drivers }}
-        when: kolla_neutron_ml2_mechanism_drivers_defined      
-- name: Can the control host reach the internet?
-  hosts: localhost
-  gather_facts: true
-  tasks:
-    - name: Check internet connectivity
-      ansible.builtin.command: "ping stackhpc.com -c 3"
-      register: internet_connectivity
-      timeout: 5
-      ignore_errors: true
-
-    - name: Set internet connectivity fact
-      ansible.builtin.set_fact:
-        internet_connectivity: "{{ not internet_connectivity.failed }}"
+          {{ 'genericswitch' in kolla_neutron_ml2_mechanism_drivers | default(false) }}
+      when: kolla_neutron_ml2_mechanism_drivers
 
 - name: Get facts for seed node
   hosts: seed
@@ -37,6 +21,16 @@
   hosts: all
   gather_facts: true
   tasks:
+    - name: Pinging stackhpc.com to check internet connectivity
+      ansible.builtin.command: "ping stackhpc.com -c 3"
+      register: successful_ping
+      timeout: 5
+      ignore_errors: true
+
+    - name: Set internet connectivity fact
+      ansible.builtin.set_fact:
+        internet_connectivity: "{{ not successful_ping.failed }}"
+        
     - name: Get OS distribution
       ansible.builtin.set_fact:
         distribution: "{{ ansible_facts.distribution }}"
@@ -49,18 +43,22 @@
       ansible.builtin.command: "uname -r"
       register: kernel_version
 
+    - name: Check if docker is installed
+      ansible.builtin.command: "which docker"
+      register: docker_check
+      failed_when: docker_check.rc not in [0]
+      ignore_errors: true
+
     - name: Get running contianers
       ansible.builtin.command: "docker ps --format {% raw %}'{{.Names}}'{% endraw %}"
       become: true
       register: containers_list
+      when: not docker_check.failed
 
-- name: Get facts for computes
-  hosts: compute
-  gather_facts: true
-  tasks:
     - name: Check if hugepages enabled
       ansible.builtin.set_fact:
-        hugepages_enabled: "{{ ansible_facts.cmdline }}"
+        hugepages_enabled: "{{ 'hugepages' in ansible_facts.cmdline }}"
+
 
 - name: Gather Cloud Facts
   hosts: localhost
@@ -69,12 +67,12 @@
     - name: Write facts to file
       vars:
         cloud_facts:
-          internet_connectivity: "{{ internet_connectivity }}"
-          seed_node_is_vm: "{{ hostvars[groups['seed'][0]]['seed_node_is_vm'] | default('N/A') }}"
+          internet_connectivity: "{{ hostvars | group_hostvars_by_var('internet_connectivity') }}"
+          seed_node_is_vm: "{{ hostvars[groups['seed'][0]]['seed_node_is_vm'] | default('N/A') if groups ['seed'] else 'N/A' }}"
           distributions: "{{ hostvars | group_hostvars_by_var('distribution') }}"
           dist_releases: "{{ hostvars | group_hostvars_by_var('distribution_release') }}"
           kernel_versions: "{{ hostvars | group_hostvars_by_var('kernel_version','stdout') }}"
-          deployed_containers: "{{ hostvars | group_hostvars_by_host('containers_list', 'stdout') }}"
+          deployed_containers: "{{ hostvars | group_hostvars_by_host('containers_list', 'stdout_lines') | default({}) }}"
           openstack_release: "{{ openstack_release }}"
           openstack_release_name: "{{ openstack_release_codename }}"
           ansible_control_host_is_vm: "{{ ansible_facts.virtualization_role == 'guest' }}"
@@ -89,8 +87,6 @@
           ceph_release: "{{ cephadm_ceph_release }}"
           storage_hyperconverged: "{{ groups['controllers'] | intersect(groups['osds']) | length > 0 | bool }}"
           wazuh_enabled: "{{ groups['wazuh-agent'] | length > 0 | bool }}"
-          # ngs_enabled_: "{{ 'genericswitch' in (kolla_neutron_ml2_mechanism_drivers | default([])) | bool }}"
-          # # ABOVE LEADS TO ERROR: argument of type ''NoneType'' is not iterable. argument of type ''NoneType'' is not iterable'
           ngs_enabled: "{{ ngs_enabled | default(false) }}"
           kayobe_managed_switches: "{{ groups['switches'] | length > 0 | bool }}"
           proxy_configured: "{{ http_proxy | bool or https_proxy | bool }}"
@@ -122,7 +118,7 @@
           kolla_image_tags: "{{ kolla_image_tags }}"
           gpu_passthrough_enabled: "{{ gpu_group_map | length > 0 | bool }}"
           vGPU_enabled: "{{ groups['vgpu'] | length > 0 | bool }}"
-          hugepages_enabled: "{{ hostvars | group_hostvars_by_host('hugepages_enabled', hosts=['compute']) }}"
+          hugepages_enabled: "{{ hostvars | group_hostvars_by_var('hugepages_enabled') }}"
       ansible.builtin.copy:
         content: "{{ cloud_facts | to_nice_json(sort_keys=false) }}"
-        dest: ~/cloud-facts_2.json
+        dest: ~/cloud-facts.json