Skip to content

Commit d6177d5

Browse files
committed
Fix issue building kayobe image
A regression was introduced in: #55 which meant that the Kayobe docker image failed to build. This is because requirements.txt was updated to point a local path that did not exist inside the docker image during the build. I've changed the logic to update the requirements.txt to use the ansible variables that configure the kayobe checkout.
1 parent f4e5451 commit d6177d5

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

ansible/deploy-openstack-config.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,6 @@
128128
create: true
129129
loop: "{{ kayobe_config_custom }}"
130130

131-
- name: Ensure Kayobe repository is present
132-
ansible.builtin.git:
133-
repo: "{{ kayobe_repo }}"
134-
version: "{{ kayobe_version }}"
135-
dest: "{{ src_directory }}/{{ kayobe_name }}"
136-
update: false
137-
138131
- name: Ensure `venvs` directory exists
139132
ansible.builtin.file:
140133
path: "{{ ansible_env.HOME }}/venvs"
@@ -159,7 +152,7 @@
159152
ansible.builtin.replace:
160153
path: "{{ src_directory }}/{{ kayobe_config_name }}/requirements.txt"
161154
regexp: "^kayobe@.*$"
162-
replace: "kayobe@git+file://{{ src_directory }}/{{ kayobe_name }}"
155+
replace: "kayobe@git+{{ kayobe_repo }}@{{ kayobe_version }}"
163156

164157
- name: Ensure `kayobe-config` requirements are installed
165158
ansible.builtin.pip:

ansible/vars/defaults.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ kayobe_config_environment: ci-multinode
1717
# timezone: Europe/London
1818
kayobe_config_custom: []
1919

20-
kayobe_repo: https://github.com/stackhpc/kayobe.git
20+
kayobe_repo: https://github.com/stackhpc/kayobe
2121
kayobe_version: stackhpc/2023.1
22-
kayobe_name: kayobe
2322

2423
openstack_config_repo: https://github.com/stackhpc/openstack-config-multinode
2524
openstack_config_version: main

0 commit comments

Comments
 (0)