Set var labs engine repo

usegalaxy-au · Oct 4, 2024 · bfe889f · bfe889f
1 parent 08ea17b
commit bfe889f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/ansible/host_vars/dev-labs.gvl.org.au.yml b/ansible/host_vars/dev-labs.gvl.org.au.yml
@@ -1 +1 @@
-git_branch: dev
+labs_engine_branch: dev
diff --git a/ansible/host_vars/labs.usegalaxy.org.au.yml b/ansible/host_vars/labs.usegalaxy.org.au.yml
@@ -1 +1 @@
-git_branch: main
+labs_engine_branch: main
diff --git a/ansible/roles/galaxy_labs_engine/defaults/main.yml b/ansible/roles/galaxy_labs_engine/defaults/main.yml
@@ -1,11 +1,13 @@
 ---
-git_branch: main
+
+labs_engine_repo: https://github.com/usegalaxy-au/galaxy-labs-engine.git
+labs_engine_branch: main
+labs_engine_docker_image: neoformit/galaxy-labs-engine:latest
 
 project_root: /home/ubuntu/labs-engine
 config_root: /home/ubuntu/config
 django_root: "{{ project_root }}/app"
 
-labs_engine_docker_image: neoformit/galaxy-labs-engine:latest
 
 labs_engine:
   templates:

diff --git a/ansible/roles/galaxy_labs_engine/tasks/main.yml b/ansible/roles/galaxy_labs_engine/tasks/main.yml
@@ -6,8 +6,8 @@
 
 - name: clone git repository for galaxy-labs-engine
   ansible.builtin.git:
-    repo: https://github.com/neoformit/galaxy-labs-engine.git
-    version: "{{ git_branch }}"
+    repo: "{{ labs_engine_repo }}"
+    version: "{{ labs_engine_branch }}"
     dest: "{{ project_root }}"
     clone: yes
     force: yes