Merge branch 'master' of...

Merge branch 'master' of gitlab.erc.monash.edu.au:hpc-team/ansible_cluster_in_a_box into sshknownhosts

roles/extra_rpms/tasks/main.yml

@@ -6,3 +6,15 @@
   ignore_errors: true
   when: ansible_os_family == 'RedHat'
 
+- name: "Check fusermount user access permission"
+  shell: fusermount --version 
+  ignore_errors: true
+  register: fusermount_user_access_error
+  when: ansible_os_family == 'RedHat'
+
+- name: "Fix fusermount user access permission"
+  file: path=/bin/fusermount mode="o=rx"
+  sudo: true
+  when: ansible_os_family == 'RedHat' and fusermount_user_access_error | failed
+
+

roles/ldapclient/tasks/configLdapClient.yml

@@ -39,6 +39,11 @@
   sudo: true
   notify: restart sssd
 
+- name: "Make the cache a tmpfs"
+  mount: name=/var/lib/sss/db/ src=tmpfs fstype=tmpfs opts='size=40m' state=mounted
+  become: true
+  become_user: root
+
 - name: "start sssd"
   service: name=sssd state=started enabled=yes
   sudo: true

roles/ldapclient/templates/sssd.j2

@@ -12,10 +12,10 @@ filter_groups = slurm, munge
 [domain/{{ ldapDomain }}]
 ldap_referrals = false
 cache_credentials = false
-entry_cache_timeout=120
-memcache_timeout=120
+entry_cache_timeout=5400
+memcache_timeout=300
 entry_cache_nowait_percentage=50
-enumerate = true
+enumerate = false
 
 id_provider = ldap
 auth_provider = ldap

roles/mysql/tasks/mysql_client.yml

 ---
 - name: "Installing MySQL Debian"
   apt: name="{{ item }}" update_cache=yes cache_valid_time=3600 state=present
-  with_items: client_packages
+  with_items: "{{ client_packages }}"
   sudo: true
   when: ansible_os_family == "Debian"
 
 - name: Installing MySQL RedHat
   yum: name="{{ item }}" state=present
-  with_items: client_packages
+  with_items: "{{ client_packages }}"
   sudo: true
   when: ansible_os_family == "RedHat"

roles/mysql/tasks/mysql_server.yml

 ---
 - name: "Installing MySQL Debian"
   apt: name="{{ item }}" update_cache=yes cache_valid_time=3600 state=present
-  with_items: server_packages
+  with_items: "{{ server_packages }}"
   sudo: true
   when: ansible_os_family == "Debian"
 
 - name: Installing MySQL RedHat
   yum: name={{ item }}
-  with_items: server_packages
+  with_items: "{{ server_packages }}"
   sudo: true
   when: ansible_os_family == "RedHat"
 

roles/nagios_monitored/files/scripts/check_apache2

@@ -11,6 +11,8 @@ STATE_WARNING=1
 dist = platform.dist()
 if dist[0] == "debian":
     command = "/usr/sbin/service apache2 status"
+elif dist[0] == "centos":
+    command = "/sbin/service httpd status"
 else:
     command = "service apache2 status"
 

roles/nagios_monitored/files/scripts/check_ldap

@@ -3,11 +3,20 @@ import sys, os, pwd
 import getopt
 import commands
 import subprocess
+import platform
 
 STATE_OK=0
 STATE_WARNING=1
 
-check_ldap=subprocess.Popen("service slapd status", shell=True, stdout=subprocess.PIPE)
+dist = platform.dist()
+if dist[0] == "debian":
+    command = "/usr/sbin/service slapd status"
+elif dist[0] == "centos":
+    command = "/sbin/service slapd status"
+else:
+    command = "service slapd status"
+
+check_ldap=subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
 ldap_status=check_ldap.communicate()[0]
 
 if "run" in ldap_status:

roles/nagios_monitored/files/scripts/check_mysql

@@ -3,11 +3,20 @@ import sys, os, pwd
 import getopt
 import commands
 import subprocess
+import platform
 
 STATE_OK=0
 STATE_WARNING=1
 
-check_mysql=subprocess.Popen("service mysqld status", shell=True, stdout=subprocess.PIPE)
+dist = platform.dist()
+if dist[0] == "debian":
+    command = "/usr/sbin/service mysql status"
+elif dist[0] == "centos":
+    command = "/sbin/service mysqld status"
+else:
+    command = "service mysql status"
+
+check_mysql=subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
 mysql_status=check_mysql.communicate()[0]
 
 if "run" in mysql_status:

roles/slurm-common/tasks/installMungeFromSource.yml

@@ -8,7 +8,7 @@
   shell: tar jxf munge-{{ munge_version }}.tar.bz2
   args:
     chdir: /tmp
-    creates: /tmp/munge-{{ munge_version }}
+    creates: /tmp/munge-{{ munge_version }}/configure
 
 - name: build munge
   shell: ./configure --prefix={{ munge_dir }} && make