From 936adad18f779f8efc2e7a775060b975088cda67 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 3 Mar 2023 17:02:30 +0000 Subject: [PATCH 01/12] Build caso container with release train See: https://github.com/stackhpc/kayobe/pull/100 --- etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 5cd653ffc..6ab48411e 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -7,6 +7,7 @@ kolla_docker_namespace: stackhpc-dev # Kolla feature flag configuration. kolla_enable_barbican: true +kolla_enable_caso: true kolla_enable_central_logging: true kolla_enable_cinder: true kolla_enable_cloudkitty: true From d887546fa6fdec2e4610412b4931c0e5a40a969b Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 3 Mar 2023 17:06:42 +0000 Subject: [PATCH 02/12] Build caso image This is required for the scientific-openstack/release train merge. --- .github/workflows/stackhpc-container-image-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml index 4f56eed5b..37e574475 100644 --- a/.github/workflows/stackhpc-container-image-build.yml +++ b/.github/workflows/stackhpc-container-image-build.yml @@ -43,7 +43,7 @@ jobs: uses: actions/checkout@v3 with: repository: stackhpc/kayobe - ref: refs/heads/stackhpc/wallaby + ref: refs/heads/wallaby/caso path: src/kayobe # FIXME: Failed in kolla-ansible : Ensure the latest version of pip is installed From 97463a842b4fa9a3e36b8152113f78817b062034 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 3 Mar 2023 17:12:31 +0000 Subject: [PATCH 03/12] Build blazar image --- etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 6ab48411e..5fdbed45f 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -7,6 +7,7 @@ kolla_docker_namespace: stackhpc-dev # Kolla feature flag configuration. kolla_enable_barbican: true +kolla_enable_blazar: true kolla_enable_caso: true kolla_enable_central_logging: true kolla_enable_cinder: true From 1f97a12c0f07a27b445b52452d5498162b073130 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 3 Mar 2023 17:22:13 +0000 Subject: [PATCH 04/12] Revert "Build caso image" This reverts commit d887546fa6fdec2e4610412b4931c0e5a40a969b. --- .github/workflows/stackhpc-container-image-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml index 37e574475..4f56eed5b 100644 --- a/.github/workflows/stackhpc-container-image-build.yml +++ b/.github/workflows/stackhpc-container-image-build.yml @@ -43,7 +43,7 @@ jobs: uses: actions/checkout@v3 with: repository: stackhpc/kayobe - ref: refs/heads/wallaby/caso + ref: refs/heads/stackhpc/wallaby path: src/kayobe # FIXME: Failed in kolla-ansible : Ensure the latest version of pip is installed From 557972da9057909d32d8afc9d30aaf2da94a7f71 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 3 Mar 2023 18:09:27 +0000 Subject: [PATCH 05/12] Add image tags for caso and blazar --- etc/kayobe/kolla/globals.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 02f46e14e..e866f1403 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -5,8 +5,12 @@ docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg" {% if kolla_base_distro == 'centos' %} bifrost_tag: wallaby-20230207T194135 +blazar_tag: wallaby-20230303T172322 +caso_tag: wallaby-20230303T172322 {% else %} bifrost_tag: wallaby-20230215T160405 +blazar_tag: wallaby-20230303T172458 +caso_tag: wallaby-20230303T172458 {% endif %} glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" From 16adeb35c994bdffb94e7801d437638b4e00bbb7 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Mon, 6 Mar 2023 11:13:55 +0000 Subject: [PATCH 06/12] Adds a release note for caso --- releasenotes/notes/add-caso-f36b98453be10169.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 releasenotes/notes/add-caso-f36b98453be10169.yaml diff --git a/releasenotes/notes/add-caso-f36b98453be10169.yaml b/releasenotes/notes/add-caso-f36b98453be10169.yaml new file mode 100644 index 000000000..fec9b8286 --- /dev/null +++ b/releasenotes/notes/add-caso-f36b98453be10169.yaml @@ -0,0 +1,8 @@ +--- + features: + - | + Adds ``caso`` container images. ``cASO`` is an is an accounting reporter + that supports Cloud Accounting Usage Records. For more information, see + the `upstream docs `__. Note that + this container does not exist in upstream Kolla and is maintained + downstream by StackHPC. From 636ea20fd2b7d336aa028739ae3dca55ffdfad98 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Mon, 6 Mar 2023 11:14:23 +0000 Subject: [PATCH 07/12] Adds a release note for blazar --- releasenotes/notes/add-blazar-fa6ecce8b21c73b4.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 releasenotes/notes/add-blazar-fa6ecce8b21c73b4.yaml diff --git a/releasenotes/notes/add-blazar-fa6ecce8b21c73b4.yaml b/releasenotes/notes/add-blazar-fa6ecce8b21c73b4.yaml new file mode 100644 index 000000000..029c00e33 --- /dev/null +++ b/releasenotes/notes/add-blazar-fa6ecce8b21c73b4.yaml @@ -0,0 +1,7 @@ +--- + features: + - | + Add ``blazar`` project Kolla container images. ``Blazar`` is a resource + reservation service for OpenStack. ``Blazar`` enables users to reserve a + specific type/amount of resources for a specific time period and it leases + these resources to users based on their reservations. From b7b08427f5cd3b3f105ed42e9249105628ca6c30 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Tue, 7 Mar 2023 17:50:44 +0000 Subject: [PATCH 08/12] Bump neutron containers to support NGS batching This is used by scientific-openstack and is opt in via a config option. See: https://github.com/stackhpc/networking-generic-switch/pull/54 --- etc/kayobe/kolla/globals.yml | 4 ++-- ...generic-switch-batching-support-adffe038ea2441d0.yaml | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/adds-networking-generic-switch-batching-support-adffe038ea2441d0.yaml diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 6fe5bc6f3..2efd37a1f 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -7,12 +7,12 @@ docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg" bifrost_tag: wallaby-20230207T194135 blazar_tag: wallaby-20230303T172322 caso_tag: wallaby-20230303T172322 -neutron_tag: wallaby-20230303T174325 +neutron_tag: wallaby-20230307T113517 {% else %} bifrost_tag: wallaby-20230215T160405 blazar_tag: wallaby-20230303T172458 caso_tag: wallaby-20230303T172458 -neutron_tag: wallaby-20230303T213058 +neutron_tag: wallaby-20230307T121824 {% endif %} glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" diff --git a/releasenotes/notes/adds-networking-generic-switch-batching-support-adffe038ea2441d0.yaml b/releasenotes/notes/adds-networking-generic-switch-batching-support-adffe038ea2441d0.yaml new file mode 100644 index 000000000..f68ab23ed --- /dev/null +++ b/releasenotes/notes/adds-networking-generic-switch-batching-support-adffe038ea2441d0.yaml @@ -0,0 +1,9 @@ +--- +features: + - | + Brings in new neutron container images to add batching support to + Networking Generic Switch. This is opt in via the ``ngs_batch_requests`` + configuration option and only affects Ironic deployments that use + Networking Generic Switch. See the following `PR + `__ for more + details. From 0f40c79cac6845da83d4e9049c539e5b02a3be9d Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 8 Mar 2023 08:56:02 +0100 Subject: [PATCH 09/12] Add release note for Neutron IPv6 metadata workaround --- .../notes/neutron-dadfailed-workaround-9cd82d29ee1fba59.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 releasenotes/notes/neutron-dadfailed-workaround-9cd82d29ee1fba59.yaml diff --git a/releasenotes/notes/neutron-dadfailed-workaround-9cd82d29ee1fba59.yaml b/releasenotes/notes/neutron-dadfailed-workaround-9cd82d29ee1fba59.yaml new file mode 100644 index 000000000..4c0b59cd2 --- /dev/null +++ b/releasenotes/notes/neutron-dadfailed-workaround-9cd82d29ee1fba59.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Disables metadata proxy over IPv6 inside Neutron DHCP agent to work around + `bug 1953165 `__. From 46cfb11a69b6b760d35cbd8af6eb4f7018f8df3b Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Wed, 8 Mar 2023 11:05:19 +0100 Subject: [PATCH 10/12] Use newer liblasso package in Ubuntu Fixes https://dev.entrouvert.org/issues/25640 --- etc/kayobe/kolla.yml | 8 ++++++++ .../notes/fix-liblasso-netiq-issue-afec5b2ee7de2a1e.yaml | 5 +++++ 2 files changed, 13 insertions(+) create mode 100644 releasenotes/notes/fix-liblasso-netiq-issue-afec5b2ee7de2a1e.yaml diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 3ca419597..cec4425fb 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -274,6 +274,14 @@ kolla_build_blocks: && grafana-cli plugins install grafana-piechart-panel ironic_inspector_header: | ADD additions-archive / + keystone_base_footer: | + {% raw %} + {% if base_package_type == 'deb' %} + RUN curl -sLO https://github.com/stackhpc/lasso/releases/download/applied%2F2.7.0-2build3/liblasso3_2.7.0-2build3_amd64.deb && \ + sudo dpkg -i liblasso3_2.7.0-2build3_amd64.deb && \ + rm -f liblasso3_2.7.0-2build3_amd64.deb + {% endif %} + {% endraw %} prometheus_v2_server_repository_version: | ARG prometheus_version='2.35.0' prometheus_alertmanager_repository_version: | diff --git a/releasenotes/notes/fix-liblasso-netiq-issue-afec5b2ee7de2a1e.yaml b/releasenotes/notes/fix-liblasso-netiq-issue-afec5b2ee7de2a1e.yaml new file mode 100644 index 000000000..4c71ad67d --- /dev/null +++ b/releasenotes/notes/fix-liblasso-netiq-issue-afec5b2ee7de2a1e.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes the `issue `__ with using + SAML2 federation in Keystone against NetIQ IdP. From 4552d3728d61a032bbd1522d9a2c68cbd8c3ffe6 Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Wed, 8 Mar 2023 12:25:29 +0100 Subject: [PATCH 11/12] Bump up Keystone's image tag for Ubuntu --- etc/kayobe/kolla/globals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 2efd37a1f..13da6b4f8 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -12,6 +12,7 @@ neutron_tag: wallaby-20230307T113517 bifrost_tag: wallaby-20230215T160405 blazar_tag: wallaby-20230303T172458 caso_tag: wallaby-20230303T172458 +keystone_tag: wallaby-20230308T104024 neutron_tag: wallaby-20230307T121824 {% endif %} From 992263081b4831f7a4d8ba0728bd635f5c73da7b Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 15 Mar 2023 13:15:30 +0000 Subject: [PATCH 12/12] Add tags for Blazar and Caso images --- etc/kayobe/kolla/globals.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 67c5b1bb6..81c231d6d 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -9,9 +9,13 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts {% if kolla_base_distro == 'centos' %} bifrost_tag: xena-20230214T165534 +blazar_tag: xena-20230315T122920 +caso_tag: xena-20230315T122920 neutron_tag: xena-20230307T142413 {% else %} bifrost_tag: xena-20230215T195824 +blazar_tag: xena-20230315T122918 +caso_tag: xena-20230315T122918 keystone_tag: xena-20230308T120251 neutron_tag: xena-20230307T142414 {% endif %}