manual merge

roles/slurm/templates/slurm.conf.j2

@@ -103,7 +103,6 @@ MpiParams=ports=12000-12999
 {% for node in nodelist|unique %}
 NodeName={{ node }} Procs={{ hostvars[node]['ansible_processor_cores'] }} State=UNKNOWN
 {% endfor %}
-
 {% for queue in slurmqueues %}
 PartitionName={{ queue.name }} Nodes={{ groups[queue.group]|join(',') }}
 {% endfor %}

topplay.yml

@@ -4,6 +4,7 @@
   roles:
   - etcHosts
 
+<<<<<<< HEAD
 #- hosts: 'x509_ca'
 #  vars:
 #  roles:
@@ -32,7 +33,10 @@
     openmpi_version: 1.8.3
     build_node: aciab-comp-0
   roles:
-<<<<<<< HEAD
+
+- hosts: 'x509_ca'
+  vars:
+  roles:
   - { role: easy-rsa-CA }
 
 - hosts: 'OpenVPN-Server'