Merge branch 'master' of https://github.com/stackhpc/ansible-role-openhpc into ohpc-2

Author: oneswig

.travis.yml

@@ -1,20 +1,18 @@
 ---
 language: python
-python: "2.7"
 
 # Use the new container infrastructure
-sudo: false
-
-# Install ansible
-addons:
-  apt:
-    packages:
-    - python-pip
-    
+sudo: required
+services:
+  - docker
+before_install:
+  - sudo apt-get -qq update
 install:
-  # Install ansible
-  - pip install ansible ansible-lint
-
+  - python3 -m pip install ansible
+  - python3 -m pip install ansible-lint
+  - python3 -m pip install molecule
+  - python3 -m pip install docker
+  
   # Check ansible version
   - ansible --version
 
@@ -34,5 +32,8 @@ script:
   # Test the custom filters
   - ansible-playbook tests/filter.yml -i tests/inventory -i tests/inventory-mock-groups
 
+  # Run molecule tests
+  - molecule test
+
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

README.md

@@ -18,9 +18,9 @@ Role Variables
   Otherwise, `groups` can be omitted and the following attributes can be defined in the partition object:
   * `name`: The name of the nodes within this group.
   * `cluster_name`: Optional.  An override for the top-level definition `openhpc_cluster_name`.
-  * `ram_mb`: Optional.  The physical RAM available in each server of this group ([slurm.conf](https://slurm.schedmd.com/slurm.conf.html) parameter `RealMemory`).
+  * `ram_mb`: Optional.  The physical RAM available in each server of this group ([slurm.conf](https://slurm.schedmd.com/slurm.conf.html) parameter `RealMemory`). This is set to the Slurm default of `1` if not defined.
 
-  For each group (if used) or partition there must be an ansible inventory group `<cluster_name>-<group_name>`. All nodes in this inventory group will be added to the group/partition. Nodes may have arbitrary hostnames but these should be lowercase to avoid a mismatch between inventory and actual hostname.
+  For each group (if used) or partition there must be an ansible inventory group `<cluster_name>_<group_name>`. All nodes in this inventory group will be added to the group/partition. Nodes may have arbitrary hostnames but these should be lowercase to avoid a mismatch between inventory and actual hostname.
 
 * `default`: Optional.  A boolean flag for whether this partion is the default.  Valid settings are `YES` and `NO`.
 * `maxtime`: Optional.  A partition-specific time limit in hours, minutes and seconds ([slurm.conf](https://slurm.schedmd.com/slurm.conf.html) parameter `MaxTime`).  The default value is

filter_plugins/group_hosts.py

@@ -45,7 +45,7 @@ def _group_hosts(hosts):
             r.append(int(suffix))
         else:
             unmatchable.append(v)
-    return ['{}[{}]'.format(k, _group_numbers(v)) for k, v in results.iteritems()] + unmatchable
+    return ['{}[{}]'.format(k, _group_numbers(v)) for k, v in results.items()] + unmatchable
 
 def _group_numbers(numbers):
     units = []

molecule/README.md

@@ -2,15 +2,15 @@ Molecule tests for the role.
 
 # Test Matrix
 
-Test options "flow down" thro table unless changed.
+Test options "flow down" through table unless changed.
 
-test   | # partitions | # groups in partitions? | other
+Test   | # Partitions | Groups in partitions?   | Other
 ---    | ---          | ---                     | ---
 test1  | 1            | N                       | 2x compute node, sequential names (default test)
 test1b | 1            | N                       | 1x compute node
 test1c | 1            | N                       | 2x compute nodes, nonsequential names
 test2  | 2            | N                       | 4x compute node, sequential names
-test3  | 1            | Y                       |
+test3  | 1            | Y                       | -
 
 # Local Installation & Running
 

templates/slurm.conf.j2

@@ -108,7 +108,7 @@ Epilog=/etc/slurm/slurm.epilog.clean
 {# If using --limit, the first host in each group may not have facts available. Find one that does. #}
 {% set group_hosts = groups[group_name] | intersect(play_hosts) %}
 
-NodeName=DEFAULT State=UNKNOWN {% if 'ram_mb' in group %} RealMemory={{group.ram_mb}}{% endif %}{% if group_hosts | length > 0 %}\
+NodeName=DEFAULT State=UNKNOWN RealMemory={% if 'ram_mb' in group %}{{group.ram_mb}}{% else %}1{% endif %}{% if group_hosts | length > 0 %}\
 {% set first_host_hv = hostvars[group_hosts | first] %}
     Sockets={{first_host_hv['ansible_processor_count']}} \
     CoresPerSocket={{first_host_hv['ansible_processor_cores']}} \