From 10a9e6148b4ca09a24bd32c6d3712a87a1b630c3 Mon Sep 17 00:00:00 2001
From: Michael Sherman <shermanm@uchicago.edu>
Date: Thu, 23 May 2024 18:34:57 +0000
Subject: [PATCH] use git submodule to pin kolla-ansible version

---
 .gitmodules       | 3 +++
 cc-ansible        | 4 +---
 src/kolla-ansible | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 src/kolla-ansible

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..6e83df1a
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/kolla-ansible"]
+	path = src/kolla-ansible
+	url = https://github.com/chameleoncloud/kolla-ansible
diff --git a/cc-ansible b/cc-ansible
index d8e3893b..b6edbbb7 100755
--- a/cc-ansible
+++ b/cc-ansible
@@ -80,12 +80,10 @@ install_deps() {
   local galaxy_collection_path="$DIR/galaxy.ansible.com/"
   ansible-galaxy collection install --force -p "$galaxy_collection_path" -r "$galaxy_requirements"
 
-  kolla_ansible_remote=https://github.com/chameleoncloud/kolla-ansible.git
-  kolla_ansible_checkout=${KOLLA_ANSIBLE_BRANCH:-chameleoncloud/xena}
   pip install \
     -r requirements.txt \
     --config-settings editable_mode=strict \
-    -e git+"$kolla_ansible_remote"@"$kolla_ansible_checkout"#egg=kolla-ansible
+    -e src/kolla-ansible
 
   # Update/install yq, adding it to the venv bin path
   YQ_VERSION=4.9.6
diff --git a/src/kolla-ansible b/src/kolla-ansible
new file mode 160000
index 00000000..9c519ee9
--- /dev/null
+++ b/src/kolla-ansible
@@ -0,0 +1 @@
+Subproject commit 9c519ee9906bbeb4d429dbd312abe61f1b2a01de