typos + renames + added reconfigure warning to docs

Author: wtripp180901

ansible/roles/topology/README.md

@@ -1,16 +1,21 @@
 topology
 ========
 
-Templates out /etc/slurm/topology.conf file based on an Openstack project for use by
+Templates out /etc/slurm/topology.conf file based on an OpenStack project for use by
 Slurm's [topology/tree plugin.](https://slurm.schedmd.com/topology.html) Models
-cluster as tree with a heirarchy of:
+cluster as tree with a hierarchy of:
 
 Top-level inter-rack Switch -> Availability Zones -> Hypervisors -> VMs
 
+Warning: This role doesn't currently trigger a restart of Slurm so will therefore not
+reconfigure an already running cluster after a `ansible/site.yml` run. You will therefore need
+to run the `ansible/adhoc/restart-slurm.yml` playbook for changes to topology.conf to be
+recognised.
+
 Role Variables
 --------------
 
-- `topology_topology_nodes:`: Required list of strs. List of inventory hostnames of nodes to include in topology tree. Must be set to include all compute nodes in Slurm cluster. Default `[]`.
+- `topology_nodes:`: Required list of strs. List of inventory hostnames of nodes to include in topology tree. Must be set to include all compute nodes in Slurm cluster. Default `[]`.
 - `topology_conf_template`: Optional str. Path to Jinja2 template of topology.conf file. Default
   `templates/topology.conf.j2`
 - `topology_above_rack_topology`: Optionally multiline str. Used to define topology above racks/AZs if 

ansible/roles/topology/defaults/main.yml

@@ -1,5 +1,5 @@
 # Nodes to be included in topology tree, must include all Slurm compute nodes
-topology_topology_nodes: []
+topology_nodes: []
 
 # Override to use custom topology.conf template
 topology_conf_template: templates/topology.conf.j2

ansible/roles/topology/tasks/main.yml

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

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

@@ -57,7 +57,7 @@ openhpc_config_default:
     - enable_configless
   TaskPlugin: task/cgroup,task/affinity
   ReturnToService: 2 # workaround for templating bug TODO: Remove once on stackhpc.openhpc v1.2.0
-  TopologyPlugin: "topology/{{ 'tree' if (topology_topology_nodes | length) > 0 else 'flat' }}"
+  TopologyPlugin: "topology/{{ 'tree' if (topology_nodes | length) > 0 else 'flat' }}"
 
 # default additional slurm.conf parameters when "rebuild" enabled:
 openhpc_config_rebuild:

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

@@ -1 +1 @@
-topology_topology_nodes: "{{ groups['topology'] }}"
+topology_nodes: "{{ groups['topology'] }}"