Skip to content

Commit 33ed1a7

Browse files
authored
Merge pull request #680 from stackhpc/install-capi-driver
add magnum-capi-helm driver to base footer
2 parents 109649a + 0162067 commit 33ed1a7

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

etc/kayobe/kolla.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,10 @@ kolla_build_blocks:
373373
{% endif %}
374374
magnum_base_footer: |
375375
RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | head -n -1 | bash
376+
{% raw %}
377+
{% set magnum_capi_packages = ['git+https://github.com/stackhpc/[email protected]'] %}
378+
RUN {{ macros.install_pip(magnum_capi_packages | customizable("pip_packages")) }}
379+
{% endraw %}
376380
# Dict mapping image customization variable names to their values.
377381
# Each variable takes the form:
378382
# <image name>_<customization>_<operation>

etc/kayobe/kolla/globals.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ enable_docker_repo: "{% raw %}{{ 'overcloud' not in group_names or ansible_facts
99
# kolla_base_distro must be set here to be resolvable on a per-host basis
1010
# This is necessary for os migrations where mixed clouds might be deployed
1111
kolla_base_distro: "{% raw %}{{ 'centos' if ansible_facts.distribution == 'Rocky' and ansible_facts.distribution_major_version == '8' else ansible_facts.distribution | lower }}{% endraw %}"
12-
12+
magnum_tag: yoga-20231002T101716
1313
opensearch_tag: yoga-20230904T121340
1414
octavia_tag: yoga-20230921T074238
1515

@@ -32,8 +32,6 @@ kayobe_image_tags:
3232
rocky: yoga-20230310T170929
3333
kibana:
3434
centos: yoga-20230907T152300
35-
magnum:
36-
rocky: yoga-20230825T142202
3735
neutron:
3836
rocky: yoga-20230728T081242
3937
nova:
@@ -56,7 +54,6 @@ grafana_tag: "{% raw %}{{ kayobe_image_tags['grafana'][kolla_base_distro] | defa
5654
ironic_tag: "{% raw %}{{ kayobe_image_tags['ironic'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
5755
ironic_dnsmasq_tag: "{% raw %}{{ kayobe_image_tags['ironic_dnsmasq'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
5856
kibana_tag: "{% raw %}{{ kayobe_image_tags['kibana'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
59-
magnum_tag: "{% raw %}{{ kayobe_image_tags['magnum'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
6057
neutron_tag: "{% raw %}{{ kayobe_image_tags['neutron'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
6158
nova_tag: "{% raw %}{{ kayobe_image_tags['nova'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
6259
nova_libvirt_tag: "{% raw %}{{ kayobe_image_tags['nova_libvirt'][kolla_base_distro] | default(nova_tag) }}{% endraw %}"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
features:
3+
- |
4+
Adds the new magnum-capi-helm out of tree driver (see here https://github.com/stackhpc/magnum-capi-helm) into release train magnum containers

0 commit comments

Comments
 (0)