roles/smux/tasks/main.yml

+---
+- name: install tmux
+  yum: name=tmux state=present
+  become: true
+  when: ansible_os_family == "RedHat"

roles/ssh-keepalive/handlers/main.yml

+- name: "sshkeepalive restart sshd"
+  service: name=sshd state=restarted
+  become: true
+  when: ansible_os_family == "RedHat"
+
+- name: "sshkeepalive restart ssh"
+  service: name=ssh state=restarted
+  become: true
+  when: ansible_os_family == "Debian"

roles/ssh-keepalive/tasks/main.yml

+- name: "Set ClientAliveInterval"
+  lineinfile:
+  args:
+    dest: /etc/ssh/sshd_config
+    regexp: "#?ClientAliveInterval [0-9]+"
+    line: "ClientAliveInterval 60"
+    backrefs: yes
+  become: true
+  notify:
+  - sshkeepalive restart sshd
+  - sshkeepalive restart ssh
+
+- name: "SetClientAliveCountMax"
+  lineinfile:
+  args:
+    dest: /etc/ssh/sshd_config
+    regexp: "#?ClientAliveCountMax [0-9]+"
+    line: "ClientAliveCountMax 5"
+    backrefs: yes
+  become: true
+  notify:
+  - sshkeepalive restart sshd
+  - sshkeepalive restart ssh
+

roles/ssh-nopassword-login/handlers/main.yml

+- name: "restart sshd"
+  service: name=sshd state=restarted
+  become: true
+  when: ansible_os_family == "RedHat"
+
+- name: "restart ssh"
+  service: name=ssh state=restarted
+  become: true
+  when: ansible_os_family == "Debian"

roles/ssh-nopassword-login/tasks/main.yml

+- name: "Disable Challenge Response"
+  lineinfile:
+  args:
+    dest: /etc/ssh/sshd_config
+    regexp: "ChallengeResponseAuthentication yes"
+    line: "ChallengeResponseAuthentication no"
+    backrefs: yes
+  become: true
+  notify:
+  - restart sshd
+  - restart ssh
+
+- name: "Disable Password"
+  lineinfile:
+  args:
+    dest: /etc/ssh/sshd_config
+    regexp: "PasswordAuthentication yes"
+    line: "PasswordAuthentication no"
+    backrefs: yes
+  become: true
+  notify:
+  - restart sshd
+  - restart ssh
+

roles/ssh-password-login/handlers/main.yml

 - name: "restart sshd"
   service: name=sshd state=restarted
-  sudo: true
+  become: true
   when: ansible_os_family == "RedHat"
 
 - name: "restart ssh"
   service: name=ssh state=restarted
-  sudo: true
+  become: true
   when: ansible_os_family == "Debian"

roles/ssh-password-login/tasks/main.yml

@@ -3,34 +3,22 @@
   args:
     dest: /etc/ssh/sshd_config
     regexp: "ChallengeResponseAuthentication no"
-    line: "ChallengeResponseAuthentication yes" 
+    line: "ChallengeResponseAuthentication yes"
     backrefs: yes
-  sudo: true
-  notify: 
+  become: true
+  notify:
   - restart sshd
   - restart ssh
 
-- name: "Enable Challenge Response"
-  lineinfile:
-  args:
-    dest: /etc/ssh/sshd_config
-    regexp: "PasswordAuthentication no"
-    line: "PasswordAuthentication yes"
-    backrefs: yes
-  sudo: true
-  notify: 
-  - restart sshd
-  - restart ssh
-
-- name: "Disable Challenge Response"
+- name: "Disable Password"
   lineinfile:
   args:
     dest: /etc/ssh/sshd_config
     regexp: "PasswordAuthentication yes"
     line: "PasswordAuthentication no"
     backrefs: yes
-  sudo: true
-  notify: 
+  become: true
+  notify:
   - restart sshd
   - restart ssh
 

roles/ssh_host_keys/tasks/main.yml

+---
+- name: copy ssh host keys
+  template: src=files/ssh_host_{{ item }}_key dest=/etc/ssh/ssh_host_{{ item }}_key mode=600 owner=root group=root
+  become: true
+  become_user: root
+  with_items:
+  - rsa
+  - dsa
+  - ecdsa
+  - ed25519
+  register: host_keys
+
+- name: restart sshd
+  service: name=sshd state=restarted
+  become: true
+  become_user: root
+  when: host_keys is changed

roles/strudel_build/tasks/main.yml

@@ -5,27 +5,20 @@
 
 - name: add epel on CentOS 7
   shell: rpm -iUvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
-  sudo: true
+  become: true
   when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
   ignore_errors: true
 
-- name: add epel on CentOS 7
-  shell: yum -y update
-  sudo: true
-  when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
-
-
-
 
 - name: install system packages apt
-  apt: name={{ item }} state=installed update_cache=true
-  sudo: true
+  apt: name={{ item }} state=present update_cache=true
+  become: true
   with_items: system_packages
   when: ansible_os_family == 'Debian'
 
 - name: install system packages yum
-  yum: name={{ item }} state=installed
-  sudo: true
+  yum: name={{ item }} state=present
+  become: true
   with_items: system_packages
   when: ansible_os_family == 'RedHat'
 
@@ -38,13 +31,13 @@
 
 - name: install pip packages
   command: pip install {{ item }}
-  sudo: true
+  become: true
   with_items: pip_packages
   when: pip_packages is defined
 
 #- name: install pkg deps
 #  shell: /tmp/strudel/system_build_scripts/{{ install_prerequisites }} chdir=/tmp/strudel
-#  sudo: true
+#  become: true
 #  when: ansible_os_family == 'RedHat'
 
 - name: build

roles/strudel_build/vars/CentOS_6_x86_64.yml

@@ -68,6 +68,6 @@
    - python-psutil
 
 
- 
+
  pkg_name: ./rpmbuild/RPMS/x86_64/strudel-{{ strudel_ver }}-1.x86_64.rpm
  dest_pkg_name: strudel_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}_{{ strudel_ver }}_x86_64.rpm

roles/strudel_build/vars/CentOS_7_x86_64.yml

@@ -65,6 +65,6 @@
    - python-psutil
 
 
- 
+
  pkg_name: ./rpmbuild/RPMS/x86_64/strudel-{{ strudel_ver }}-1.x86_64.rpm
  dest_pkg_name: strudel_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}_{{ strudel_ver }}_x86_64.rpm

roles/strudel_build/vars/Fedora_19_x86_64.yml

@@ -66,6 +66,6 @@
    - python-psutil
 
 
- 
+
  pkg_name: ./rpmbuild/RPMS/x86_64/strudel-0.6.0-1.x86_64.rpm
  dest_pkg_name: strudel_{{ ansible_distribution }}_{{ ansible_distribution_version }}_{{ hostvars[ansible_hostname]['ansible_date_time']['date'] }}_x86_64.rpm

roles/strudel_build/vars/Fedora_20_x86_64.yml

@@ -67,6 +67,6 @@
    - python-psutil
 
 
- 
+
  pkg_name: ./rpmbuild/RPMS/x86_64/strudel-{{ strudel_ver }}-1.x86_64.rpm
  dest_pkg_name: strudel_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}_{{ strudel_ver }}_x86_64.rpm

roles/strudel_config/tasks/main.yml

 - name: "Set login node"
-  set_fact: 
+  set_fact:
     loginNode: "{{ ansible_eth0.ipv4.address }}"
 
 - name: "Temlate Strudel config"

roles/strudel_config/templates/generic_slurm_config.json.j2

 [
     [
-        "GenericDesktops"
+{% for partition in slurmqueues %}
+        "{{ partition.name }}"{% if not loop.last %},{% endif %}
+{% endfor %}
     ],
     {
-        "GenericDesktops": {
+{% for partition in slurmqueues %}
+        "{{ partition.name }}": {
             "__class__": "siteConfig",
             "__module__": "siteConfig",
             "agent": {
@@ -121,7 +124,7 @@
                 "__class__": "cmdRegEx",
                 "__module__": "siteConfig",
                 "async": false,
-                "cmd": "{{ slurm_dir }}/bin/squeue -u {username} -o \\\"%i %L\\\" | tail -n -1",
+                "cmd": "\"{{ slurm_dir }}/bin/squeue -u {username} -o \\\"%i %L\\\" | tail -n -1\"",
                 "failFatal": true,
                 "formatFatal": false,
                 "host": "login",
@@ -268,7 +271,7 @@
                 "__class__": "cmdRegEx",
                 "__module__": "siteConfig",
                 "async": false,
-                "cmd": "\"mkdir ~/.vnc ; rm -f ~/.vnc/clearpass ; touch ~/.vnc/clearpass ; chmod 600 ~/.vnc/clearpass ; passwd=\"'$'\"( dd if=/dev/urandom bs=1 count=8 2>/dev/null | md5sum | cut -b 1-8 ) ; echo \"'$'\"passwd > ~/.vnc/clearpass ; cat ~/.vnc/clearpass | vncpasswd -f > ~/.vnc/passwd ; chmod 600 ~/.vnc/passwd ; echo -e '#!/bin/bash\\nvncserver ; sleep 36000000 ' |  {{slurm_dir}}/bin/sbatch -p batch -N {nodes} -n {ppn} --time={hours}:00:00 -J desktop_{username} -o .vnc/slurm-%j.out \"",
+                "cmd": "\"mkdir ~/.vnc ; rm -f ~/.vnc/clearpass ; touch ~/.vnc/clearpass ; chmod 600 ~/.vnc/clearpass ; passwd=\"'$'\"( dd if=/dev/urandom bs=1 count=8 2>/dev/null | md5sum | cut -b 1-8 ) ; echo \"'$'\"passwd > ~/.vnc/clearpass ; cat ~/.vnc/clearpass | vncpasswd -f > ~/.vnc/passwd ; chmod 600 ~/.vnc/passwd ; echo -e '#!/bin/bash\\nexport PATH=\"'$'\"PATH:/bin ; vncserver ; sleep 36000000 ' |  {{slurm_dir}}/bin/sbatch -p {{ partition.name }} -N {nodes} -n {ppn} --time={hours}:00:00 -J desktop_{username} -o .vnc/slurm-%j.out \"",
                 "failFatal": true,
                 "formatFatal": false,
                 "host": "login",
@@ -345,7 +348,7 @@
                 "host": "exec",
                 "loop": false,
                 "regex": [
-                    "^.*?New 'X' desktop is \\S+(?P<vncDisplay>:[0-9]+)\\s*$"
+                    "^.*?New .* desktop is \\S+(?P<vncDisplay>:[0-9]+)\\s*$"
                 ],
                 "requireMatch": true
             },
@@ -447,6 +450,7 @@
                 ],
                 "requireMatch": true
             }
-        }
+        }{% if not loop.last %},{% endif %}
+{% endfor %}
     }
 ]

roles/strudel_config/templates/turbo_slurm_config.json.j2

@@ -121,7 +121,7 @@
                 "__class__": "cmdRegEx",
                 "__module__": "siteConfig",
                 "async": false,
-                "cmd": "squeue -u {username} -o \\\"%i %L\\\" | tail -n -1",
+                "cmd": "\"squeue -u {username} -o \\\"%i %L\\\" | tail -n -1\"",
                 "failFatal": true,
                 "formatFatal": false,
                 "host": "login",
@@ -449,4 +449,4 @@
             }
         }
     }
-]
+]
\ No newline at end of file

roles/strudel_test/tasks/main.yml

@@ -2,12 +2,12 @@
 - include_vars: "{{ ansible_distribution }}_{{ ansible_distribution_major_version }}_{{ ansible_architecture }}.yml"
 
 - name: get turbovnc
-  shell: wget http://sourceforge.net/projects/turbovnc/files/1.2.3/turbovnc_1.2.3_amd64.deb 
+  shell: wget http://sourceforge.net/projects/turbovnc/files/1.2.3/turbovnc_1.2.3_amd64.deb
   when: ansible_os_family == "Debian"
 
 - name: install turobvnc
   apt: deb=turbovnc_1.2.3_amd64.deb
-  sudo: true
+  become: true
   when: ansible_os_family == "Debian"
 
 - name: get turbovnc
@@ -16,19 +16,19 @@
 
 - name: install turobvnc
   yum: src=turbovnc-1.2.3.x86_64.rpm
-  sudo: true
+  become: true
   when: ansible_os_family == "RedHat"
 
 - name: copy launcher
   copy: src=/tmp/{{ dest_pkg_name }} dest=/tmp/{{ dest_pkg_name }}
 
 - name: install launhcer
-  apt: deb=/tmp/{{ dest_pkg_name }} 
-  sudo: true
+  apt: deb=/tmp/{{ dest_pkg_name }}
+  become: true
   when: ansible_os_family == "Debian"
 
 - name: install launcher
   yum: src=/tmp/{{ dest_pkg_name }}
-  sudo: true
+  become: true
   when: ansible_os_family == "RedHat"
 

roles/strudel_test/vars/CentOS_6_x86_64.yml

@@ -68,6 +68,6 @@
    - python-psutil
 
 
- 
+
  pkg_name: ./rpmbuild/RPMS/x86_64/strudel-{{ strudel_ver }}-1.x86_64.rpm
  dest_pkg_name: strudel_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}_{{ strudel_ver }}_x86_64.rpm

roles/strudel_test/vars/CentOS_7_x86_64.yml

@@ -65,6 +65,6 @@
    - python-psutil
 
 
- 
+
  pkg_name: ./rpmbuild/RPMS/x86_64/strudel-{{ strudel_ver }}-1.x86_64.rpm
  dest_pkg_name: strudel_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}_{{ strudel_ver }}_x86_64.rpm

roles/strudel_test/vars/Fedora_19_x86_64.yml

@@ -66,6 +66,6 @@
    - python-psutil
 
 
- 
+
  pkg_name: ./rpmbuild/RPMS/x86_64/strudel-0.6.0-1.x86_64.rpm
  dest_pkg_name: strudel_{{ ansible_distribution }}_{{ ansible_distribution_version }}_{{ hostvars[ansible_hostname]['ansible_date_time']['date'] }}_x86_64.rpm