Merge branch 'master' of https://github.com/monash-merc/ansible_cluster_in_a_box into desktopbranch

roles/karaage2.7_noppolicy/tasks/main.yml

@@ -13,7 +13,7 @@
   lineinfile:  
   args:
     dest: /etc/karaage/ldap_schemas.py 
-    regexp: "from placard.schemas.pwdpolicy import pwdPolicyMixin" 
+    regexp: 'from placard.schemas.pwdpolicy import pwdPolicyMixin'
     line: "from placard.schemas.defaultUnlocked import defaultUnlockedMixin" 
     backrefs: yes
   sudo: true
@@ -22,7 +22,7 @@
   lineinfile:  
   args:
     dest: /etc/karaage/ldap_schemas.py 
-    regexp: "    mixin_list = [ common.personMixin, pwdPolicyMixin, kPersonMixin ]"
+    regexp: '    mixin_list = \[ common.personMixin, pwdPolicyMixin, kPersonMixin \]'
     line: "    mixin_list = [ common.personMixin, defaultUnlockedMixin, kPersonMixin ]"
     backrefs: yes
   sudo: true
@@ -31,7 +31,7 @@
   lineinfile:  
   args:
     dest: /etc/karaage/ldap_schemas.py 
-    regexp: "class person(rfc.person, rfc.organizationalPerson, rfc.inetOrgPerson, rfc.pwdPolicy, common.baseMixin):"
-    line: class person(rfc.person, rfc.organizationalPerson, rfc.inetOrgPerson, common.baseMixin):"
+    regexp: 'class person\(rfc.person, rfc.organizationalPerson, rfc.inetOrgPerson, rfc.pwdPolicy, common.baseMixin\):'
+    line: "class person(rfc.person, rfc.organizationalPerson, rfc.inetOrgPerson, common.baseMixin):"
     backrefs: yes
   sudo: true

roles/nfs-client/handlers/main.yml

 ---
-- name: restart authentication
-  shell: authconfig --updateall
-  when: nfs_type == "nfs4"
-  sudo: true
-
 - name: restart idmap 
   service: name={{ item }} state=restarted
   with_items:

roles/openLdapClient/tasks/configLdapClient.yml

@@ -6,6 +6,11 @@
     - nsswitch.conf
   sudo: true
 
+- name: "Copy the CA cert"
+  copy: src={{ ldapCaCertSrc }} dest={{ ldapCaCertFile }} owner=root mode=644
+  sudo: true
+  when: ldapCaCertSrc is defined
+
 - name: "Copy pam config to ldap client"
   template: src=system-auth-ac.j2 dest=/etc/pam.d/system-auth-ac
   sudo: true

roles/slurm-build/tasks/main.yml

@@ -54,15 +54,12 @@
   args:
     creates: /tmp/rpmbuild/RPMS/x86_64/slurm-{{ slurm_version }}-1.el6.x86_64.rpm
 
-#- name: retrieve rpms
-#  shell: scp -r {{ hostvars[ansible_hostname]['ansible_user_id'] }}@{{ ansible_ssh_host }}:/tmp/rpmbuild/ /tmp
-#  delegate_to: 127.0.0.1
-#  when: ansible_ssh_host | defined
-#  when: ansible_ssh_host | defined
-#  sudo: true
+- name: retrieve rpms 1
+  shell: scp -r {{ hostvars[ansible_hostname]['ansible_user_id'] }}@{{ ansible_ssh_host }}:/tmp/rpmbuild/ /tmp
+  delegate_to: 127.0.0.1
+  when: ansible_ssh_host is defined
 
-- name: retrieve rpms
+- name: retrieve rpms 2
   shell: scp -r {{ hostvars[ansible_hostname]['ansible_user_id'] }}@{{ ansible_hostname }}:/tmp/rpmbuild/ /tmp
   delegate_to: 127.0.0.1
-#  when: ansible_ssh_host | not defined
-
+  when: ansible_ssh_host is not defined

roles/syncExports/tasks/addExports.yml

@@ -4,8 +4,10 @@
   template: src=exports.j2 dest=/etc/exports owner=root group=root mode=644
   delegate_to: "{{ nfs_server }}"
   run_once: true
+  sudo: true
 -
   name : Restart the NFS Server
   service: name=nfs state=restarted
   delegate_to: "{{ nfs_server }}"
   run_once: true
+  sudo: true