Merge pull request #59 from stackhpc/bugfix/kayobe-docker-imae

Fix issue building kayobe image

Author: markgoddard

ansible/deploy-openstack-config.yml

@@ -128,13 +128,6 @@
         create: true
       loop: "{{ kayobe_config_custom }}"
 
-    - name: Ensure Kayobe repository is present
-      ansible.builtin.git:
-        repo: "{{ kayobe_repo }}"
-        version: "{{ kayobe_version }}"
-        dest: "{{ src_directory }}/{{ kayobe_name }}"
-        update: false
-
     - name: Ensure `venvs` directory exists
       ansible.builtin.file:
         path: "{{ ansible_env.HOME }}/venvs"
@@ -159,7 +152,7 @@
       ansible.builtin.replace:
         path: "{{ src_directory }}/{{ kayobe_config_name }}/requirements.txt"
         regexp: "^kayobe@.*$"
-        replace: "kayobe@git+file://{{ src_directory }}/{{ kayobe_name }}"
+        replace: "kayobe@git+{{ kayobe_repo }}@{{ kayobe_version }}"
 
     - name: Ensure `kayobe-config` requirements are installed
       ansible.builtin.pip:

ansible/vars/defaults.yml

@@ -17,9 +17,8 @@ kayobe_config_environment: ci-multinode
 #       timezone: Europe/London
 kayobe_config_custom: []
 
-kayobe_repo: https://github.com/stackhpc/kayobe.git
+kayobe_repo: https://github.com/stackhpc/kayobe
 kayobe_version: stackhpc/2023.1
-kayobe_name: kayobe
 
 openstack_config_repo: https://github.com/stackhpc/openstack-config-multinode
 openstack_config_version: main