Reorganize and rejigger

roles/pvc/tasks/main.yml

@@ -1,29 +1,48 @@
 ---
+
+# First-run check
+- name: check if this is a new instance
+  shell: "echo 'bootstrapped' > /etc/pvc-install"
+  args:
+    creates: /etc/pvc-install
+  register: newhost_check
+
+- name: set newhost fact
+  set_fact:
+    newhost: yes
+  when: newhost_check.changed
+
+- include: common/add_cluster_ips.yml
+  when: newhost is defined and newhost
+
+# General blacklisting of modules
 - name: add module blacklist
   template:
     src: system/blacklist.j2
     dest: /etc/modprobe.d/blacklist.conf
 
-- include: ceph.yml
+# Install base databases
+- include: ceph/main.yml
   tags: pvc-ceph
 
-- include: zookeeper.yml
+- include: zookeeper/main.yml
   tags: pvc-zookeeper
 
-- meta: flush_handlers
-
-- include: libvirt.yml
-  tags: pvc-libvirt
-
-- include: frr.yml
-  tags: pvc-frr
-
-- include: patroni.yml
+- include: patroni/main.yml
   tags: pvc-patroni
 
-- meta: flush_handlers
+# Install core services
+- include: libvirt/main.yml
+  tags: pvc-libvirt
 
-- include: pvc.yml
+- include: frr/main.yml
+  tags: pvc-frr
+
+- include: remove_cluster_ips.yml
+  when: newhost is defined and newhost
+
+# Install PVC sequentially
+- include: pvc/main.yml
   tags: pvc-pvc
   run_once: true
   delegate_to: "{{ play_host }}"