11 files changed, 30 insertions, 35 deletions
diff --git a/playbooks/ands-gluster-ganesha.yml b/playbooks/ands-gluster-ganesha.yml
index a347c4f..cbdf72c 100644
--- a/playbooks/ands-gluster-ganesha.yml
+++ b/playbooks/ands-gluster-ganesha.yml
@@ -1,8 +1,4 @@
-- name: Common setup procedures
-  hosts: ands
-  roles:
-    - role: ands_facts
-
+- import_playbook: maintain.yml
 
 - name: Configure GlusterFS cluster 
   hosts: masters, new_masters
diff --git a/playbooks/maintain.yml b/playbooks/maintain.yml
index 80061ec..0a8cfe4 100644
--- a/playbooks/maintain.yml
+++ b/playbooks/maintain.yml
@@ -4,3 +4,9 @@
     - role: ands_facts
     - { role: ands_network, action: maintain }
 
+# We need all mount points ready
+- name: "Run mount -a"
+  hosts: ands
+  tasks:
+    - command: mount -a
+      changed_when: false
diff --git a/playbooks/openshift-setup-apps.yml b/playbooks/openshift-setup-apps.yml
index 0719f5d..6cc8a0c 100644
--- a/playbooks/openshift-setup-apps.yml
+++ b/playbooks/openshift-setup-apps.yml
@@ -1,7 +1,4 @@
-- name: Analyze Ands configuration
-  hosts: nodes
-  roles:
-    - { role: ands_facts }
+- import_playbook: maintain.yml
 
 - name: "Configure apps for {{ kaas_single_project }}"
   hosts: masters
diff --git a/playbooks/openshift-setup-project.yml b/playbooks/openshift-setup-project.yml
index b36301b..8a8c49a 100644
--- a/playbooks/openshift-setup-project.yml
+++ b/playbooks/openshift-setup-project.yml
@@ -1,7 +1,4 @@
-- name: Analyze Ands configuration
-  hosts: nodes
-  roles:
-    - { role: ands_facts }
+- import_playbook: maintain.yml
 
 - name: Configure per-node {{ kaas_single_project }} project storage
   hosts: ands_storage_servers
diff --git a/playbooks/openshift-setup-projects.yml b/playbooks/openshift-setup-projects.yml
index 16b9e66..aac5eb0 100644
--- a/playbooks/openshift-setup-projects.yml
+++ b/playbooks/openshift-setup-projects.yml
@@ -1,7 +1,4 @@
-- name: Analyze Ands configuration
-  hosts: nodes
-  roles:
-    - { role: ands_facts }
+- import_playbook: maintain.yml
 
 - name: Configure users & user projects
   hosts: masters
diff --git a/playbooks/openshift-setup-security.yml b/playbooks/openshift-setup-security.yml
index ba96354..af7b9e9 100644
--- a/playbooks/openshift-setup-security.yml
+++ b/playbooks/openshift-setup-security.yml
@@ -1,7 +1,4 @@
-- name: Analyze Ands configuration
-  hosts: nodes
-  roles:
-    - { role: ands_facts }
+- import_playbook: maintain.yml
 
 - name: Configure security
   hosts: masters
diff --git a/playbooks/openshift-setup-storage.yml b/playbooks/openshift-setup-storage.yml
index 64099bc..7bc1b22 100644
--- a/playbooks/openshift-setup-storage.yml
+++ b/playbooks/openshift-setup-storage.yml
@@ -1,8 +1,5 @@
 ---
-- name: Analyze Ands configuration
-  hosts: nodes
-  roles:
-    - { role: ands_facts }
+- import_playbook: maintain.yml
 
 - name: Configure GlusterFS storage
   hosts: nodes
diff --git a/playbooks/openshift-setup-users.yml b/playbooks/openshift-setup-users.yml
index 998dd59..03057d9 100644
--- a/playbooks/openshift-setup-users.yml
+++ b/playbooks/openshift-setup-users.yml
@@ -1,7 +1,4 @@
-- name: Analyze Ands configuration
-  hosts: nodes
-  roles:
-    - { role: ands_facts }
+- import_playbook: maintain.yml
 
 - name: Configure users
   hosts: masters
diff --git a/playbooks/openshift-setup-vpn.yml b/playbooks/openshift-setup-vpn.yml
index c6db977..ccac69e 100644
--- a/playbooks/openshift-setup-vpn.yml
+++ b/playbooks/openshift-setup-vpn.yml
@@ -1,7 +1,4 @@
-- name: Analyze Ands configuration
-  hosts: ands
-  roles:
-    - role: ands_facts
+- import_playbook: maintain.yml
 
 - name: OpenVPN service
   hosts: nodes
diff --git a/playbooks/openshift-setup.yml b/playbooks/openshift-setup.yml
index d5675e4..4af10cb 100644
--- a/playbooks/openshift-setup.yml
+++ b/playbooks/openshift-setup.yml
@@ -1,7 +1,9 @@
-- name: Analyze Ands configuration
+- import_playbook: maintain.yml
+
+- name: Configure Firewall
   hosts: ands
   roles:
-    - role: ands_facts
+    - { role: ands_network, action: firewall }
 
 - name: Various OpenShift resources
   hosts: nodes
diff --git a/playbooks/software.yml b/playbooks/software.yml
new file mode 100644
index 0000000..884be34
--- /dev/null
+++ b/playbooks/software.yml
@@ -0,0 +1,12 @@
+#- name: Determin Ands facts
+#  hosts: ands
+#  roles:
+#    - role: ands_facts
+
+- name: Add missing software
+  hosts: ands
+  roles:
+    - role_includer
+  vars:
+    role_includer_name: ands_common
+    role_includer_tasks: software.yml