From 936adad18f779f8efc2e7a775060b975088cda67 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 3 Mar 2023 17:02:30 +0000 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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.