purge.sh

@@ -18,13 +18,13 @@ for host in $@; do
     sudo systemctl stop ceph-mon@$(hostname -s);
     sudo systemctl stop ceph-mgr@$(hostname -s);
     sudo systemctl stop patroni;
-    for key in $( echo "ls /" | sudo /usr/share/zookeeper/bin/zkCli.sh -server $(hostname -s):2181 | grep --color=none zookeeper | tr -d "[]," | tr " " "\n" | grep -v zookeeper ); do
-        echo "rmr /${key}" | sudo /usr/share/zookeeper/bin/zkCli.sh -server $(hostname -s):2181;
+    for key in $( echo "ls /" | sudo /usr/share/zookeeper/bin/zkCli.sh | grep --color=none zookeeper | tr -d "[]," | tr " " "\n" | grep -v zookeeper ); do
+        echo "rmr /${key}" | sudo /usr/share/zookeeper/bin/zkCli.sh;
     done
     sudo systemctl stop zookeeper;
     sudo rm -rf /etc/pvc-install.* /etc/ceph* /etc/patroni* /etc/postgres* /etc/zookeeper* /etc/libvirt*;
-    sudo rm -rf /var/lib/postgresql /var/lib/zookeeper/* /var/lib/libvirt /var/lib/ceph/*;
-    suod rm -rf /var/log/postgresql /var/log/zookeeper /var/log/libvirt /var/log/ceph;
+    sudo rm -rf /var/lib/postgresql /var/lib/zookeeper /var/lib/libvirt;
+    suod rm -rf /var/log/postgresql /var/log/zookeeper /var/log/libvirt;
     sudo rm -rf /run/ceph;
     sudo rm -rf /etc/systemd/system/ceph-*.target.wants;
     sudo apt purge -y *pvc*;

roles/pvc/tasks/patroni/bootstrap.yml

@@ -8,7 +8,7 @@
     - patroni
 
 - name: remove any existing patroni keys in Zookeeper
-  command: /usr/share/zookeeper/bin/zkCli.sh -server $(hostname -s):2181 rmr /patroni
+  command: /usr/share/zookeeper/bin/zkCli.sh rmr /patroni
   ignore_errors: true
 
 - name: start Patroni

roles/pvc/tasks/zookeeper/bootstrap.yml

@@ -9,5 +9,5 @@
     seconds: 10
 
 - name: ensure Zookeeper is running on node1
-  shell: echo "ls /" | /usr/share/zookeeper/bin/zkCli.sh -server $(hostname -s):2181
+  shell: echo "ls /" | /usr/share/zookeeper/bin/zkCli.sh
   when: ansible_local.host_id == 1