Merge pull request #72 from CVL-GitHub/m2cvlbranch

fix slurm cpus

roles/cvlExtraFiles/vars/readme.txt

 ---
 extraFiles:
-  - {src: '/usr/local/etc/sshfs_default_sites.cfg', dest: '/etc/sshfs_default_sites.cfg', type: 'link'}
   - {src: '/usr/local/etc/vnc/turbovncserver-auth.conf', dest: '/etc/turbovncserver-auth.conf', type: 'link'}
   - {src: '/usr/local/etc/vnc/turbovncserver.conf', dest: '/etc/turbovncserver.conf', type: 'link'}
   - {src: '/usr/local/etc/profile.d/modules.sh', dest: '/etc/profile.d/modules.sh', type: 'link'}

roles/setupKnownHosts/tasks/main.yml

 - name: "Templating /etc/ssh/known_hosts"
   template: src=known_hosts.j2 dest=/etc/ssh/known_hosts owner=root group=root mode=600
-  delegate_to: "{{ slurmlogin }}"
-  run_once: true
   sudo: true
   register: sshknowhost 
 
 - name: ecrypt the hosts file
   shell: ssh-keygen -H -f /etc/ssh/known_hosts
   sudo: true
-  run_once: true
   when: sshknowhost.changed
 

roles/setupKnownHosts/templates/known_hosts.j2

 {% set nodelist = [] %}
-{% for desktop in desktopNodeList %}
-{% for node in groups[desktop.name] %}
-{% if hostvars[node]['ansible_'+desktop.interface] is defined %}
-{% set host = {'name': node, 'ip': hostvars[node]['ansible_'+desktop.interface]['ipv4']['address'], 'rsa': hostvars[node]['ansible_ssh_host_key_rsa_public']} %}
+{% for node in groups['all'] %}
+{% for interface in hostvars[node]['ansible_interfaces'] %}
+{% if interface != "lo" %}
+{% set host = {'name': node, 'ip': hostvars[node]['ansible_'+interface]['ipv4']['address'], 'rsa': hostvars[node]['ansible_ssh_host_key_rsa_public']} %}
 {% if nodelist.append(host) %}
 {% endif %}
 {% endif %}
@@ -10,5 +10,6 @@
 {% endfor %}
 
 {% for host in nodelist|unique %}
-{{ host.ip }} {{ host.name }} {{ host.rsa }}
+{{ host.ip }} ssh-rsa {{ host.rsa }}
+{{ host.name }} ssh-rsa {{ host.rsa }}
 {% endfor %}

roles/setupKnownHosts/templates/known_hosts.j2.v1

-{% set nodelist = [] %}
-{% for desktop in desktopNodeList %}
-{% for node in groups[desktop.name] %}
-{% if hostvars[node]['ansible_'+desktop.interface] is defined %}
-{% if not ssh-keygen -F hostvars[node] -f /etc/ssh/known_hosts and not ssh-keygen -F hostvars[node]['ansible_'+desktop.interface] -f /etc/ssh/known_hosts %}
-{% set host = {name: node, ip: hostvars[node]['ansible_'+desktop.interface]} %}
-{% if nodelist.append(host) %}
-{% endif %}
-{% endif %}
-{% endif %}
-{% endfor %}
-{% endfor %}
-
-{% for host in nodelist|unique %}
-ssh-keyscan -t rsa {{ host.name }} >> /etc/ssh/known_hosts
-ssh-keyscan -t rsa {{ host.ip }} >> /etc/ssh/known_hosts
-{% endfor %}

roles/setupKnownHosts/templates/known_hosts.j2.v2

-{% set nodelist = [] %}
-{% for desktop in desktopNodeList %}
-{% for node in groups[desktop.name] %}
-{% if hostvars[node]['ansible_'+desktop.interface] is defined %}
-{% if not ssh-keygen -F node -f /etc/ssh/known_hosts and not ssh-keygen -F hostvars[node]['ansible_'+desktop.interface]['ipv4']['address'] -f /etc/ssh/known_hosts %}
-{% set host = {name: node, ip: hostvars[node]['ansible_'+desktop.interface]['ipv4']['address']} %}
-{% if nodelist.append(host) %}
-{% endif %}
-{% endif %}
-{% endif %}
-{% endfor %}
-{% endfor %}
-
-{% for host in nodelist|unique %}
-echo "{{ host.name }} {{ host.ip }}"
-#ssh-keyscan -t rsa {{ host.name }} >> /etc/ssh/known_hosts
-#ssh-keyscan -t rsa {{ host.ip }} >> /etc/ssh/known_hosts
-{% endfor %}

roles/setupKnownHosts/templates/known_hosts.j2.v3

-{% set nodelist = [] %}
-{% for desktop in desktopNodeList %}
-{% for node in groups[desktop.name] %}
-{% if hostvars[node]['ansible_'+desktop.interface] is defined %}
-{% set host = {'name': node, 'ip': hostvars[node]['ansible_'+desktop.interface]['ipv4']['address']} %}
-{% if nodelist.append(host) %}
-{% endif %}
-{% endif %}
-{% endfor %}
-{% endfor %}
-
-{% for host in nodelist|unique %}
-echo "{{ host.name }} {{ host.ip }}"
-#ssh-keyscan -t rsa {{ host.name }} >> /etc/ssh/known_hosts
-#ssh-keyscan -t rsa {{ host.ip }} >> /etc/ssh/known_hosts
-{% endfor %}

roles/slurm/templates/slurm.conf.j2

@@ -128,7 +128,7 @@ MpiParams=ports=12000-12999
 {% endfor %}
 {% endfor %}
 {% for node in nodelist|unique %}
-NodeName={{ node }} Procs={{ hostvars[node]['ansible_processor_vcpus'] }} State=UNKNOWN
+NodeName={{ node }} Procs={{ hostvars[node]['ansible_processor_vcpus'] }} 
 {% endfor %}
 
 {% for queue in slurmqueues %}