use git submodule to pin kolla-ansible version

ChameleonCloud · May 23, 2024 · 10a9e61 · 10a9e61
1 parent c6d8429
commit 10a9e61
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.gitmodules 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
@@ -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