diff --git a/roles/extra_rpms/tasks/main.yml b/roles/extra_rpms/tasks/main.yml index 8990ee65a7c75207705070369756ee0efbad131e..dde65974accbf019afbac0d1655e129ce9e84277 100644 --- a/roles/extra_rpms/tasks/main.yml +++ b/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 + + diff --git a/roles/ldapclient/tasks/configLdapClient.yml b/roles/ldapclient/tasks/configLdapClient.yml index 3e22db75422d4647405933e4379b34548da6aa24..4b91158eed7187ebd807b0d995e306aa023d2d03 100644 --- a/roles/ldapclient/tasks/configLdapClient.yml +++ b/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 diff --git a/roles/ldapclient/templates/sssd.j2 b/roles/ldapclient/templates/sssd.j2 index 3e3df42240f606921eb7acdb4dbbaa510f43664b..17de2c97c1a66d05cc994902d51ab1f08476c723 100644 --- a/roles/ldapclient/templates/sssd.j2 +++ b/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 diff --git a/roles/mysql/tasks/mysql_client.yml b/roles/mysql/tasks/mysql_client.yml index 05a1022d073868f6f2cd19bc21ae905871a6e64e..bffd83e36077055f0a1224999eded1ae17444fdc 100644 --- a/roles/mysql/tasks/mysql_client.yml +++ b/roles/mysql/tasks/mysql_client.yml @@ -1,12 +1,12 @@ --- - 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" diff --git a/roles/mysql/tasks/mysql_server.yml b/roles/mysql/tasks/mysql_server.yml index 1d2d054f80fcd5aaad722d01186ac9be03c4d358..68806bdadbed24eb4f3cb66f949556860cfdcecf 100644 --- a/roles/mysql/tasks/mysql_server.yml +++ b/roles/mysql/tasks/mysql_server.yml @@ -1,13 +1,13 @@ --- - 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" diff --git a/roles/nagios_monitored/files/scripts/check_apache2 b/roles/nagios_monitored/files/scripts/check_apache2 index 07362631fe887206df572386ba10297ef1d96ed1..c9a50f406e7f390939ee14d7b01d41534dff776a 100755 --- a/roles/nagios_monitored/files/scripts/check_apache2 +++ b/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" diff --git a/roles/nagios_monitored/files/scripts/check_ldap b/roles/nagios_monitored/files/scripts/check_ldap index 8917b8061c61fafc2b830089abfd8e744075cb0c..7ac7f4fcd47161bbb524bbef4043da32dadba387 100755 --- a/roles/nagios_monitored/files/scripts/check_ldap +++ b/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: diff --git a/roles/nagios_monitored/files/scripts/check_mysql b/roles/nagios_monitored/files/scripts/check_mysql index b075bee507085d99bdeb82b73462845757033845..f2b64eb6757380fad60b8bf53e1bab5abcb34752 100755 --- a/roles/nagios_monitored/files/scripts/check_mysql +++ b/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: diff --git a/roles/slurm-common/tasks/installMungeFromSource.yml b/roles/slurm-common/tasks/installMungeFromSource.yml index 06c72f5197dd8352b6c32d7d6838147b132b0b51..8d27a45364f2f221584971e2bf36aca78003a368 100644 --- a/roles/slurm-common/tasks/installMungeFromSource.yml +++ b/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