Merge pull request #63 from stackhpc/fix-yoga

Fix Yoga deployments

Author: markgoddard

ansible/deploy-openstack-config.yml

@@ -143,6 +143,28 @@
         create: true
       loop: "{{ kayobe_config_custom }}"
 
+    - name: Determine OpenStack release
+      ansible.builtin.shell:
+        cmd: >
+          awk -F'=' '/defaultbranch/ {print $2}' {{ src_directory }}/{{ kayobe_config_name }}/.gitreview |
+          sed -E "s,(stable|unmaintained)/,,"
+      register: openstack_release
+      changed_when: false
+
+    # Yoga and earlier releases require a Kayobe checkout for the symlinks in
+    # etc/kayobe/ansible/ to resolve correctly.
+    - name: Set a fact about whether a Kayobe source checkout is required
+      ansible.builtin.set_fact:
+        kayobe_src_required: "{{ openstack_release.stdout != 'zed' and not openstack_release.stdout.startswith('202') }}"
+
+    - name: Ensure Kayobe repository is present (Yoga & earlier)
+      ansible.builtin.git:
+        repo: "{{ kayobe_repo }}"
+        version: "{{ kayobe_version or 'stackhpc/' ~ openstack_release.stdout }}"
+        dest: "{{ src_directory }}/{{ kayobe_name }}"
+        update: false
+      when: kayobe_src_required
+
     - name: Ensure `venvs` directory exists
       ansible.builtin.file:
         path: "{{ ansible_env.HOME }}/venvs"
@@ -177,6 +199,14 @@
         virtualenv_command: "/usr/bin/python3 -m venv"
         state: present
 
+    - name: Ensure `kayobe` is installed (Yoga & earlier)
+      ansible.builtin.pip:
+        name: "{{ src_directory }}/{{ kayobe_name }}/"
+        virtualenv: "{{ ansible_env.HOME }}/venvs/kayobe"
+        virtualenv_command: "/usr/bin/python3 -m venv"
+        state: present
+      when: kayobe_src_required
+
     - name: Ensure vault password is present
       ansible.builtin.copy:
         src: "{{ vault_password_path }}"

ansible/vars/defaults.yml

@@ -19,6 +19,7 @@ kayobe_config_custom: []
 
 kayobe_repo: https://github.com/stackhpc/kayobe
 kayobe_version:
+kayobe_name: kayobe
 
 openstack_config_repo: https://github.com/stackhpc/openstack-config-multinode
 openstack_config_version: main

templates/deploy-openstack.tpl

@@ -161,7 +161,7 @@ git -C $${config_directories[kayobe]} submodule init
 git -C $${config_directories[kayobe]} submodule update
 
 # Set base image for kayobe container. Use rocky 9 for zed+ CentOS otherwise
-if grep -Eq "(2023|zed)" $${config_directories[kayobe]}/.gitreview; then
+if grep -Eq "(2023|zed|yoga)" $${config_directories[kayobe]}/.gitreview; then
     export BASE_IMAGE=rockylinux:9
 else
     export BASE_IMAGE=quay.io/centos/centos:stream8