13 files changed, 58 insertions, 13 deletions
diff --git a/playbooks/ands-gluster-ganesha.yml b/playbooks/ands-gluster-ganesha.yml
index 586dd07..a347c4f 100644
--- a/playbooks/ands-gluster-ganesha.yml
+++ b/playbooks/ands-gluster-ganesha.yml
@@ -7,6 +7,7 @@
 - name: Configure GlusterFS cluster 
   hosts: masters, new_masters
   roles:
+    - { role: ands_network, action: ganesha }
     - { role: glusterfs, action: ganesha }
     - { role: ganesha }
   vars:
diff --git a/playbooks/ands-gluster.yml b/playbooks/ands-gluster.yml
index 8aa30fc..6e71b55 100644
--- a/playbooks/ands-gluster.yml
+++ b/playbooks/ands-gluster.yml
@@ -3,7 +3,6 @@
   roles:
     - role: ands_facts
 
-
 - name: Configure GlusterFS cluster 
   hosts: ands_servers
   roles:
@@ -13,3 +12,8 @@
     glusterfs_servers: "{{ ands_storage_servers }}"
     glusterfs_bricks_path: "{{ ands_data_path }}/glusterfs"
     glusterfs_domains: "{{ ands_storage_domains }}"
+
+- name: Configure Backup
+  hosts: ands_servers
+  roles:
+    - role: ands_backup
diff --git a/playbooks/ands-prepare.yml b/playbooks/ands-prepare.yml
index d198ec0..239d292 100644
--- a/playbooks/ands-prepare.yml
+++ b/playbooks/ands-prepare.yml
@@ -11,10 +11,15 @@
 - name: Common setup procedures
   hosts: ands
   roles:
-    - role: common
-    - role: firewall
+    - { role: ands_common }
+    - { role: firewall }
     - { role: ands_network, action: common }
 
+- name: Setup NTP
+  hosts: ands:!virtual
+  roles:
+    - role: ntp
+
 - name: Keepalived service
   hosts: masters
   roles:
@@ -22,7 +27,7 @@
 
 #OpenVPN started before Origin-node causes problems
 #- name: OpenVPN service
-#  hosts: nodes, new_nodes
+#  hosts: nodes:new_nodes
 #  roles:
 #    - role: openvpn
 #  vars:
@@ -36,7 +41,7 @@
     - role: ands_storage
 
 - name: Docker setup
-  hosts: nodes, new_nodes
+  hosts: nodes:new_nodes
   roles:
     - role: docker
   vars:
diff --git a/playbooks/openshift-add-masters.yml b/playbooks/openshift-add-masters.yml
index 99672d0..6878137 100644
--- a/playbooks/openshift-add-masters.yml
+++ b/playbooks/openshift-add-masters.yml
@@ -2,7 +2,7 @@
   hosts: nodes:new_nodes
   roles:
     - { role: ands_facts }
-    - { role: common, os_update: true }
+    - { role: ands_common, os_update: true }
     - { role: ands_network, action: install_pre }
 
 # etcd will provisioned as well if node is listed in new_etcd
diff --git a/playbooks/openshift-add-nodes.yml b/playbooks/openshift-add-nodes.yml
index c788e12..3d3efc4 100644
--- a/playbooks/openshift-add-nodes.yml
+++ b/playbooks/openshift-add-nodes.yml
@@ -2,7 +2,7 @@
   hosts: nodes:new_nodes
   roles:
     - { role: ands_facts }
-    - { role: common, os_update: true }
+    - { role: ands_common, os_update: true }
     - { role: ands_network, action: install_pre }
 
 # I am not sure if etcd will be automatic here. If not, we may need to run etcd scaleup afterwards
diff --git a/playbooks/openshift-deploy-cluster.yml b/playbooks/openshift-deploy-cluster.yml
deleted file mode 120000
index 2a18fca..0000000
--- a/playbooks/openshift-deploy-cluster.yml
+++ /dev/null
@@ -1 +0,0 @@
-../anslib/openshift-ansible/playbooks/deploy_cluster.yml
-\ No newline at end of file
diff --git a/playbooks/openshift-install-service-catalog.yml b/playbooks/openshift-install-service-catalog.yml
new file mode 100644
index 0000000..b6c0a10
--- /dev/null
+++ b/playbooks/openshift-install-service-catalog.yml
@@ -0,0 +1,13 @@
+- name: Configure cluster hosts names 
+  hosts: nodes
+  roles:
+    - { role: ands_facts }
+    - { role: ands_network, action: install_pre }
+
+- import_playbook: ../anslib/openshift-ansible/playbooks/prerequisites.yml
+- import_playbook: ../anslib/openshift-ansible/playbooks/openshift-service-catalog/config.yml
+
+- name: Configure cluster hosts names 
+  hosts: nodes
+  roles:
+    - { role: ands_network, action: install_post }
diff --git a/playbooks/openshift-redeploy-certificates.yml b/playbooks/openshift-redeploy-certificates.yml
index f812372..682468f 120000..100644
--- a/playbooks/openshift-redeploy-certificates.yml
+++ b/playbooks/openshift-redeploy-certificates.yml
@@ -1 +1,13 @@
-../anslib/openshift-ansible/playbooks/redeploy-certificates.yml
-\ No newline at end of file
+- name: Configure cluster hosts names 
+  hosts: nodes
+  roles:
+    - { role: ands_facts }
+    - { role: ands_network, action: install_pre }
+
+- import_playbook: ../anslib/openshift-ansible/playbooks/prerequisites.yml
+- import_playbook: ../anslib/openshift-ansible/playbooks/redeploy-certificates.yml
+
+- name: Configure cluster hosts names 
+  hosts: nodes
+  roles:
+    - { role: ands_network, action: install_post }
diff --git a/playbooks/openshift-setup-project.yml b/playbooks/openshift-setup-project.yml
index 6150cdf..a4666e3 100644
--- a/playbooks/openshift-setup-project.yml
+++ b/playbooks/openshift-setup-project.yml
@@ -1,5 +1,5 @@
 - name: Analyze Ands configuration
-  hosts: masters
+  hosts: nodes
   roles:
     - { role: ands_facts }
 
diff --git a/playbooks/openshift-setup-projects.yml b/playbooks/openshift-setup-projects.yml
index 689ecb4..164f91c 100644
--- a/playbooks/openshift-setup-projects.yml
+++ b/playbooks/openshift-setup-projects.yml
@@ -1,5 +1,5 @@
 - name: Analyze Ands configuration
-  hosts: masters
+  hosts: nodes
   roles:
     - { role: ands_facts }
 
diff --git a/playbooks/openshift-setup-security.yml b/playbooks/openshift-setup-security.yml
index f576ba5..ba96354 100644
--- a/playbooks/openshift-setup-security.yml
+++ b/playbooks/openshift-setup-security.yml
@@ -1,5 +1,5 @@
 - name: Analyze Ands configuration
-  hosts: masters
+  hosts: nodes
   roles:
     - { role: ands_facts }
 
diff --git a/playbooks/openshift-setup-users.yml b/playbooks/openshift-setup-users.yml
index f54a806..998dd59 100644
--- a/playbooks/openshift-setup-users.yml
+++ b/playbooks/openshift-setup-users.yml
@@ -1,5 +1,5 @@
 - name: Analyze Ands configuration
-  hosts: masters
+  hosts: nodes
   roles:
     - { role: ands_facts }
 
diff --git a/playbooks/openshift-upgrade.yml b/playbooks/openshift-upgrade.yml
index f2680ab..dd60639 100644
--- a/playbooks/openshift-upgrade.yml
+++ b/playbooks/openshift-upgrade.yml
@@ -3,5 +3,16 @@
   roles:
     - { role: ands_facts }
 #    - { role: ands_openshift, subrole: hostnames }
+    - { role: ands_network, action: install_pre }
 
+- import_playbook: ../anslib/openshift-ansible/playbooks/prerequisites.yml
+
+# Updating service catalog breaks etcd health checks (see docs/upgrade.txt)
 - import_playbook: ../anslib/openshift-ansible/playbooks/byo/openshift-cluster/upgrades/v3_7/upgrade.yml
+  vars:
+    openshift_enable_service_catalog: false
+
+- name: Configure cluster hosts names 
+  hosts: nodes
+  roles:
+    - { role: ands_network, action: install_post }