From 9842f628a3bba79c277c1b0f66ba91a00d3eda09 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Wed, 13 Dec 2023 15:48:12 -0500
Subject: [PATCH] Use GO zkcli instead of trash BASH one

With Debian 12+ the interactive zkCli.sh is completely broken, failing
to load the JLine module regardless of what is done, and no one in the
project seems to care about that.

Instead let's swap this out for the (non-interactive) GO-based zkcli of
https://github.com/go-zkcli/zkcli instead, as this suits our needs
nicely.
---
 roles/base/templates/var/home/user/bashrc.j2 | 5 ++---
 roles/pvc/tasks/zookeeper/main.yml           | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/base/templates/var/home/user/bashrc.j2 b/roles/base/templates/var/home/user/bashrc.j2
index b68cd74..5b3368f 100755
--- a/roles/base/templates/var/home/user/bashrc.j2
+++ b/roles/base/templates/var/home/user/bashrc.j2
@@ -102,9 +102,8 @@ alias virsh='sudo virsh -c qemu:///system'
 alias ceph='sudo ceph'
 alias rbd='sudo rbd'
 
-# Cool aliases
-alias cccp='sudo rsync -auv --progress'
-alias zkcli='sudo /usr/share/zookeeper/bin/zkCli.sh -server $(hostname -s):2181'
+# PVC subsystem aliases
+alias zk='/usr/bin/zkcli --servers $(hostname -s):2181'
 alias patronictl='sudo -E patronictl -c /etc/patroni/config.yml'
 
 #
diff --git a/roles/pvc/tasks/zookeeper/main.yml b/roles/pvc/tasks/zookeeper/main.yml
index d7d22ec..600c991 100644
--- a/roles/pvc/tasks/zookeeper/main.yml
+++ b/roles/pvc/tasks/zookeeper/main.yml
@@ -4,6 +4,7 @@
     name:
       - zookeeper
       - zookeeper-bin
+      - zkcli
     state: latest
   register: apt_res
   retries: 5