From 773fd5a9d457e381730d7ec59fccb9251c9d212b Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:42:28 -0400
Subject: [PATCH] Ensure all zkCli has -server set

---
 purge.sh                                | 4 ++--
 roles/pvc/tasks/patroni/bootstrap.yml   | 2 +-
 roles/pvc/tasks/zookeeper/bootstrap.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/purge.sh b/purge.sh
index 5b20433..ebbd931 100755
--- a/purge.sh
+++ b/purge.sh
@@ -18,8 +18,8 @@ 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 | grep --color=none zookeeper | tr -d "[]," | tr " " "\n" | grep -v zookeeper ); do
-        echo "rmr /${key}" | sudo /usr/share/zookeeper/bin/zkCli.sh;
+    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;
     done
     sudo systemctl stop zookeeper;
     sudo rm -rf /etc/pvc-install.* /etc/ceph* /etc/patroni* /etc/postgres* /etc/zookeeper* /etc/libvirt*;
diff --git a/roles/pvc/tasks/patroni/bootstrap.yml b/roles/pvc/tasks/patroni/bootstrap.yml
index 3f74469..4c3ee14 100644
--- a/roles/pvc/tasks/patroni/bootstrap.yml
+++ b/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 rmr /patroni
+  command: /usr/share/zookeeper/bin/zkCli.sh -server $(hostname -s):2181 rmr /patroni
   ignore_errors: true
 
 - name: start Patroni
diff --git a/roles/pvc/tasks/zookeeper/bootstrap.yml b/roles/pvc/tasks/zookeeper/bootstrap.yml
index 239e607..f6b9f94 100644
--- a/roles/pvc/tasks/zookeeper/bootstrap.yml
+++ b/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
+  shell: echo "ls /" | /usr/share/zookeeper/bin/zkCli.sh -server $(hostname -s):2181
   when: ansible_local.host_id == 1