refactor + added to CI groups

Author: wtripp180901

ansible/roles/topology/defaults/main.yml

@@ -1,2 +1,5 @@
-# If set to non-empty string, will override topology.conf file auto-detected from OpenStack project
-topology_topology_override: ""
+# Nodes to be included in topology tree, must include all Slurm compute nodes
+topology_topology_nodes: []
+
+# If set, will override topology.conf file auto-detected from OpenStack project
+# topology_topology_override:

ansible/roles/topology/tasks/main.yml

@@ -1,7 +1,7 @@
 - name: Map instances to hosts
   become: false
   map_hosts:
-    compute_vms: "{{ groups['compute'] }}"
+    compute_vms: "{{ topology_topology_nodes }}"
   register: _topology
   delegate_to: localhost
   run_once: true

ansible/roles/topology/templates/topology.conf.j2

@@ -1,6 +1,6 @@
 # topology.conf
 # Switch Configuration
-{% if topology_topology_override != '' %}
+{% if topology_topology_override is defined %}
 {{ topology_topology_override }}
 {% else %}
 {% for az in _topology.topology.keys() %}

environments/common/inventory/group_vars/all/topology.yml

@@ -0,0 +1 @@
+topology_topology_groups: "{{ groups['topology'] }}"

environments/common/layouts/everything

@@ -135,3 +135,6 @@ builder
 [nhc:children]
 # Hosts to configure for node health checks
 compute
+
+[topology:children]
+compute