From 384a8a2b67b60ddca1e7820da3f6a9bcfa00eb97 Mon Sep 17 00:00:00 2001
From: pneerincx <pieter.neerincx@gmail.com>
Date: Fri, 25 Jan 2019 15:10:30 +0100
Subject: [PATCH 1/2] Fixed order of steps in docs.

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3b39600a3..23110078c 100644
--- a/README.md
+++ b/README.md
@@ -79,6 +79,9 @@ These roles install various docker images built and hosted by RuG webhosting. Th
 #### Deployment of OpenStack
 The steps below describe how to get from machines with a bare ubuntu 16.04 installed to a running openstack installation.
 
+#### Steps to upgrade the OpenStack cluster
+
+### 3. Steps to deploy HPC compute cluster on top of OpenStack cluster
 ---
 
 0. Clone this repo.
@@ -178,7 +181,3 @@ The steps below describe how to get from machines with a bare ubuntu 16.04 insta
      ```
 
 7. verify operation.
-
-#### Steps to upgrade openstack cluster.
-
-### 3. Steps to install Compute cluster on top of openstack cluster.

From a2821def7b2931b15cfb5f77c391effaffab2d99 Mon Sep 17 00:00:00 2001
From: pneerincx <pieter.neerincx@gmail.com>
Date: Fri, 25 Jan 2019 16:09:39 +0100
Subject: [PATCH 2/2] Updated ldap role: added missing dependency on dbus
 service and removed gearshift specific vars, which were already moved to
 group_vars.

---
 roles/ldap/defaults/main.yml |  7 +++++++
 roles/ldap/meta/main.yml     |  1 +
 roles/ldap/tasks/main.yml    | 31 ++++++++++++++++++-------------
 roles/ldap/vars/main.yml     |  7 -------
 4 files changed, 26 insertions(+), 20 deletions(-)
 delete mode 100644 roles/ldap/vars/main.yml

diff --git a/roles/ldap/defaults/main.yml b/roles/ldap/defaults/main.yml
index dac27df42..89105e686 100644
--- a/roles/ldap/defaults/main.yml
+++ b/roles/ldap/defaults/main.yml
@@ -1,3 +1,10 @@
 ---
 firewall_allowed_tcp_ports:
   - "22"
+ldap_port: 389
+ldaps_port: 636
+uri_ldap: ''
+uri_ldaps: ''
+ldap_base: ''
+ldap_binddn: ''
+...
diff --git a/roles/ldap/meta/main.yml b/roles/ldap/meta/main.yml
index a04372266..050e08555 100644
--- a/roles/ldap/meta/main.yml
+++ b/roles/ldap/meta/main.yml
@@ -4,3 +4,4 @@ dependencies:
     vars:
       firewall_allowed_tcp_ports:
         - "22"
+...
diff --git a/roles/ldap/tasks/main.yml b/roles/ldap/tasks/main.yml
index da98ba40e..5b5eefd97 100644
--- a/roles/ldap/tasks/main.yml
+++ b/roles/ldap/tasks/main.yml
@@ -11,7 +11,7 @@
       - pam_script
       - oddjob-mkhomedir
 
-- name: install nslcd.conf
+- name: Deploy nslcd.conf
   template:
     src: nslcd.conf
     dest: /etc/nslcd.conf
@@ -19,7 +19,7 @@
     group: root
     mode: '0600'
 
-- name: install ldap.conf
+- name: Deploy ldap.conf
   template:
     src: ldap.conf
     dest: /etc/ssh/ldap.conf
@@ -27,7 +27,7 @@
     group: root
     mode: '0644'
 
-- name: install nsswitch.conf
+- name: Deploy nsswitch.conf
   copy:
     src: nsswitch.conf
     dest: /etc/nsswitch.conf
@@ -35,11 +35,12 @@
     group: root
     mode: '0644'
 
-- file:
+- name: Create /etc/pam-script.d/ dir.
+  file:
     name: /etc/pam-script.d
     state: directory
 
-- name: install login_checks.sh
+- name: Install login_checks.sh script.
   copy:
     src: login_checks.sh
     dest: /etc/pam-script.d/login_checks.sh
@@ -47,7 +48,7 @@
     group: root
     mode: '0755'
 
-- name: set symlinks to pam_script
+- name: Enable pam_script.
   file:
     src: pam_script
     dest: "/etc/{{ item }}"
@@ -61,7 +62,7 @@
     - pam_script_ses_close
     - pam_script_ses_open
 
-- name: set symlinks to login_checks.sh
+- name: Enable login_checks.sh script for ses_open.
   file:
     src: login_checks.sh
     dest: "/etc/pam-script.d/{{ item }}"
@@ -71,34 +72,38 @@
   with_items:
     - login_checks.sh_ses_open
 
-- copy:
+- name: Deploy password-auth-ac for PAM.
+  copy:
     src: password-auth-ac
     dest: /etc/pam.d/password-auth-ac
     owner: root
     group: root
     mode: '0600'
 
-- name: set sshd config
+- name: Deploy sshd config.
   template:
     src: templates/sshd_config
     dest: /etc/ssh/sshd_config
 
-- name: enable services
+- name: Enable services.
   systemd:
     name: "{{ item }}"
     enabled: yes
   with_items:
     - nslcd
+    - dbus.service
     - oddjobd.service
 
-- name: authconfig magic
+- name: Run authconfig update.
   shell: "authconfig --enablemkhomedir --update"
 
-- name: restart daemons
+- name: Reload services.
   service:
     name: "{{item}}"
-    state: restarted
+    state: reloaded
   with_items:
     - nslcd
+    - dbus
     - oddjobd
     - sshd
+...
\ No newline at end of file
diff --git a/roles/ldap/vars/main.yml b/roles/ldap/vars/main.yml
deleted file mode 100644
index c45863cb1..000000000
--- a/roles/ldap/vars/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-uri_ldap: 172.23.40.249
-uri_ldaps: comanage-in.id.rug.nl
-ldap_port: 389
-ldaps_port: 636
-ldap_base: ou=umcg,o=asds
-ldap_binddn: cn=clusteradminumcg,o=asds