From 309b36d3eea691f2608fff57aa404b132def63ec Mon Sep 17 00:00:00 2001
From: CVL-GitHub <jupiter.hu@monash.edu>
Date: Thu, 12 Feb 2015 04:24:17 +0000
Subject: [PATCH] fixed exceptions
---
roles/extra_rpms/vars/main.yml | 2 ++
roles/openLdapClient/tasks/configLdapClient.yml | 7 ++++---
roles/openLdapClient/tasks/installOpenLdap.yml | 8 ++++----
roles/slurm/tasks/main.yml | 8 +++++++-
4 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/roles/extra_rpms/vars/main.yml b/roles/extra_rpms/vars/main.yml
index 7688964..f2c94b9 100644
--- a/roles/extra_rpms/vars/main.yml
+++ b/roles/extra_rpms/vars/main.yml
@@ -170,6 +170,7 @@ pkgs:
- python-paramiko
- python-pmw
- python-setuptools
+ - python-psycopg2
- pytz
- qhull
- qt
@@ -236,4 +237,5 @@ pkgs:
- perl-HTML-Parser
- perl-HTML-Tagset
- postgresql-contrib
+ - postgresql-devel
- environment-modules
diff --git a/roles/openLdapClient/tasks/configLdapClient.yml b/roles/openLdapClient/tasks/configLdapClient.yml
index b55b502..c401d4b 100644
--- a/roles/openLdapClient/tasks/configLdapClient.yml
+++ b/roles/openLdapClient/tasks/configLdapClient.yml
@@ -15,6 +15,7 @@
- name: "make basedir"
file: path={{ ldapCaCertDir.stdout }} state=directory owner=root
sudo: true
+ ignore_errors: true
- name: "Copy the CA cert"
copy: src={{ ldapCaCertSrc }} dest={{ ldapCaCertFile }} owner=root mode=644
@@ -38,9 +39,9 @@
template: src=authconfig.j2 dest=/etc/sysconfig/authconfig
sudo: true
-#- name: "Copy ldap.conf file "
-# template: src=ldap.conf.j2 dest=/etc/openldap/ldap.conf
-# sudo: true
+- name: "Copy ldap.conf file "
+ template: src=ldap.conf.j2 dest=/etc/openldap/ldap.conf
+ sudo: true
- name: "Add LDAP server IP address to /etc/hosts"
lineinfile: dest=/etc/hosts line="{{ ldapServerHostIpLine }}" state=present insertafter=EOF
diff --git a/roles/openLdapClient/tasks/installOpenLdap.yml b/roles/openLdapClient/tasks/installOpenLdap.yml
index 659a86d..29f085f 100644
--- a/roles/openLdapClient/tasks/installOpenLdap.yml
+++ b/roles/openLdapClient/tasks/installOpenLdap.yml
@@ -2,15 +2,15 @@
- name: "Install open ldap package yum"
action: yum pkg={{ item }} state=installed
with_items:
- # - openldap
- # - openldap-clients
+ - openldap
+ - openldap-clients
- sssd
- sssd-common
- sssd-client
- nss
- nss-tools
- # - nss-pam-ldapd
- # - pam_ldap
+ - nss-pam-ldapd
+ - pam_ldap
sudo: true
when: ansible_os_family == 'RedHat'
diff --git a/roles/slurm/tasks/main.yml b/roles/slurm/tasks/main.yml
index 8b7824c..191269e 100644
--- a/roles/slurm/tasks/main.yml
+++ b/roles/slurm/tasks/main.yml
@@ -1,6 +1,6 @@
---
- name: copy rpms
- copy: src=/tmp/rpmbuild dest=/tmp/
+ copy: src=/tmp/rpmbuild dest=/tmp
sudo: true
- name: install munge rpms
@@ -15,13 +15,19 @@
- perl-DBI
sudo: true
+- name: check slurm account
+ shell: id slurm
+ register: slurm_account
+
- name: create slurm group
group: name=slurm system=yes
sudo: true
+ when: slurm_account | failed
- name: create slurm user
user: name=slurm group=slurm system=yes createhome=no
sudo: true
+ when: slurm_account | failed
- name: install slurm rpms
shell: "rpm --install /tmp/rpmbuild/RPMS/x86_64/slurm*{{ slurm_version }}*rpm"
--
GitLab