Merge branch 'stackhpc/yoga' into os-capacity-more-fixes

Author: mnasiadka

etc/kayobe/environments/ci-aio/automated-setup.sh

@@ -6,7 +6,7 @@ cat << EOF | sudo tee -a /etc/hosts
 10.205.3.187 pulp-server pulp-server.internal.sms-cloud
 EOF
 
-if [ sudo vgdisplay | grep -q lvm2 ]; then
+if sudo vgdisplay | grep -q lvm2; then
    sudo lvextend -L 4G /dev/rootvg/lv_home -r || true
    sudo lvextend -L 4G /dev/rootvg/lv_tmp -r || true
 fi

etc/kayobe/kolla.yml

@@ -373,6 +373,10 @@ kolla_build_blocks:
     {% endif %}
   magnum_base_footer: |
     RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | head -n -1 | bash
+    {% raw %}
+    {% set magnum_capi_packages = ['git+https://github.com/stackhpc/[email protected]'] %}
+    RUN {{ macros.install_pip(magnum_capi_packages | customizable("pip_packages")) }}
+    {% endraw %}
 # Dict mapping image customization variable names to their values.
 # Each variable takes the form:
 # <image name>_<customization>_<operation>

etc/kayobe/kolla/globals.yml

@@ -9,7 +9,7 @@ enable_docker_repo: "{% raw %}{{ 'overcloud' not in group_names or ansible_facts
 # kolla_base_distro must be set here to be resolvable on a per-host basis
 # This is necessary for os migrations where mixed clouds might be deployed
 kolla_base_distro: "{% raw %}{{ 'centos' if ansible_facts.distribution == 'Rocky' and ansible_facts.distribution_major_version == '8' else ansible_facts.distribution | lower }}{% endraw %}"
-
+magnum_tag: yoga-20231002T101716
 opensearch_tag: yoga-20230904T121340
 octavia_tag: yoga-20230921T074238
 
@@ -32,8 +32,6 @@ kayobe_image_tags:
     rocky: yoga-20230310T170929
   kibana:
     centos: yoga-20230907T152300
-  magnum:
-    rocky: yoga-20230825T142202
   neutron:
     rocky: yoga-20230728T081242
   nova:
@@ -56,7 +54,6 @@ grafana_tag: "{% raw %}{{ kayobe_image_tags['grafana'][kolla_base_distro] | defa
 ironic_tag: "{% raw %}{{ kayobe_image_tags['ironic'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
 ironic_dnsmasq_tag: "{% raw %}{{ kayobe_image_tags['ironic_dnsmasq'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
 kibana_tag: "{% raw %}{{ kayobe_image_tags['kibana'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
-magnum_tag: "{% raw %}{{ kayobe_image_tags['magnum'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
 neutron_tag: "{% raw %}{{ kayobe_image_tags['neutron'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
 nova_tag: "{% raw %}{{ kayobe_image_tags['nova'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
 nova_libvirt_tag: "{% raw %}{{ kayobe_image_tags['nova_libvirt'][kolla_base_distro] | default(nova_tag) }}{% endraw %}"

releasenotes/notes/magnum-capi-driver-2dd8cf6e68a1919c.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Adds the new magnum-capi-helm out of tree driver (see here https://github.com/stackhpc/magnum-capi-helm) into release train magnum containers