From 943e80a3fbeffdedf2b75cb9e3ba1a3af39fafcc Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 20 Jan 2023 16:18:23 +0100 Subject: [PATCH 01/12] Remove trailing white space --- README.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 21f7d6753..d8e39fa87 100644 --- a/README.rst +++ b/README.rst @@ -201,7 +201,7 @@ see this message when you later try to run ``pulp-container-sync.yml``: The issue is that pushing an image automatically creates a `container-push repository `__ which conflicts with the creation of a regular container repository of the same -name. You can resolve this conflict by deleting the distribution associated +name. You can resolve this conflict by deleting the distribution associated with the push repository using the pulp CLI: .. code-block:: console @@ -210,16 +210,16 @@ with the push repository using the pulp CLI: Started background task /pulp/api/v3/tasks/1f0a474a-b7c0-44b4-9ef4-ed633077f4d8/ .Done. -HTTP Error 404: Not Found +HTTP Error 404: Not Found ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -If your login credentials are incorrect, or lack the required permissions, +If your login credentials are incorrect, or lack the required permissions, you will see a 404 error during ``pulp-repo-sync.yml``: .. code-block:: console TASK [stackhpc.pulp.pulp_repository : Sync RPM remotes into repositories] **************************************************************************************************************************************** An exception occurred during task execution. To see the full traceback, use -vvv. The error was: Exception: Task failed to complete. (failed; 404, message='Not Found', url=URL('https://ark.stackhpc.com/pulp/content/centos/8-stream/BaseOS/x86_64/os/20211122T102435')) - failed: [localhost] (item=centos-stream-8-baseos-development) => changed=false + failed: [localhost] (item=centos-stream-8-baseos-development) => changed=false ansible_loop_var: item item: name: centos-stream-8-baseos-development From 9b74850bf20a01a04aeb9b557144d2a1a89187cc Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Tue, 24 Jan 2023 10:40:31 +0000 Subject: [PATCH 02/12] gitignore .vscode directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 713cead5c..17cbc4fe2 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ pip-log.txt *~ .*.swp .*sw? +.vscode/* # Files generated by Ansible ansible/*.retry From 9fae5d659b0ab1424071490848a6f580c08baa6d Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Mon, 16 Jan 2023 13:47:49 +0000 Subject: [PATCH 03/12] Make pulp timeout variable --- etc/kayobe/containers/pulp/post.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/containers/pulp/post.yml b/etc/kayobe/containers/pulp/post.yml index fdb5506cc..f2cb46e84 100644 --- a/etc/kayobe/containers/pulp/post.yml +++ b/etc/kayobe/containers/pulp/post.yml @@ -4,8 +4,8 @@ url: "{{ pulp_url }}/pulp/api/v3/status/" register: pulp_status until: pulp_status is success - retries: 30 - delay: 2 + retries: "{{ pulp_timeout_retries | default(30) }}" + delay: "{{ pulp_timeout_delay | default(3) }}" - name: Set the Pulp admin password become: true From d0f40788e14c69113b2abeead71ff8a3fa590bcb Mon Sep 17 00:00:00 2001 From: Matt Anson Date: Wed, 25 Jan 2023 09:38:45 +0000 Subject: [PATCH 04/12] Use StackHPC kolla build sources for Wallaby Use downstream build sources for kolla images for cinder, glance and nova. --- etc/kayobe/kolla.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index bb649872b..00bd0ff99 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -123,10 +123,18 @@ kolla_sources: type: git location: https://github.com/stackhpc/stackhpc-inspector-plugins.git reference: 1.3.0 + cinder-base: + type: git + location: https://github.com/stackhpc/cinder.git + reference: stackhpc/{{ openstack_release }} cloudkitty-base: type: git location: https://github.com/stackhpc/cloudkitty.git reference: stackhpc/wallaby + glance-base: + type: git + location: https://github.com/stackhpc/glance.git + reference: stackhpc/{{ openstack_release }} horizon-plugin-cloudkitty-dashboard: type: git location: https://github.com/stackhpc/cloudkitty-dashboard.git @@ -144,6 +152,10 @@ kolla_sources: type: git location: https://github.com/stackhpc/networking-generic-switch.git reference: stackhpc/wallaby + nova-base: + type: git + location: https://github.com/stackhpc/nova.git + reference: stackhpc/{{ openstack_release }} ############################################################################### # Kolla image build configuration. From 3ff9729bd12c1b85c02bdd3d7114473a778eb23b Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 25 Jan 2023 13:25:47 +0000 Subject: [PATCH 05/12] OSSA-2023-002: update cinder, glance & nova images for CentOS & Ubuntu These images include backported fixes for OSSA-2023-002. https://security.openstack.org/ossa/OSSA-2023-002.html --- etc/kayobe/kolla/globals.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 9ffa63154..91d71172d 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -5,17 +5,21 @@ docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg" {% if kolla_base_distro == 'centos' %} bifrost_tag: wallaby-20220921T100954 +cinder_tag: wallaby-20230125T101644 +glance_tag: wallaby-20230125T101644 magnum_tag: wallaby-20230111T101726 -nova_tag: wallaby-20230119T093225 +nova_tag: wallaby-20230125T101644 rabbitmq_tag: wallaby-20221205T160115 {% else %} bifrost_tag: wallaby-20220825T112231 +cinder_tag: wallaby-20230125T132411 cloudkitty_tag: wallaby-20221215T220154 +glance_tag: wallaby-20230125T132411 kolla_toolbox_tag: wallaby-20221222T161624 magnum_tag: wallaby-20230111T103759 neutron_tag: wallaby-20221222T161624 neutron_tls_proxy_tag: "{% raw %}{{ openstack_tag }}{% endraw %}" -nova_tag: wallaby-20221222T161624 +nova_tag: wallaby-20230125T132411 octavia_tag: wallaby-20221222T161624 openvswitch_tag: wallaby-20221222T161624 ovn_tag: wallaby-20221222T161624 From 4cb709a0421cf6adb8283f78dda12434f7b4d3c2 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Fri, 27 Jan 2023 12:44:03 +0100 Subject: [PATCH 06/12] use haproxy_tag for glance_tls_proxy and neutron_tls_proxy --- etc/kayobe/kolla/globals.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 91d71172d..c30ccb09d 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -7,7 +7,9 @@ docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg" bifrost_tag: wallaby-20220921T100954 cinder_tag: wallaby-20230125T101644 glance_tag: wallaby-20230125T101644 +glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" magnum_tag: wallaby-20230111T101726 +neutron_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" nova_tag: wallaby-20230125T101644 rabbitmq_tag: wallaby-20221205T160115 {% else %} @@ -15,10 +17,11 @@ bifrost_tag: wallaby-20220825T112231 cinder_tag: wallaby-20230125T132411 cloudkitty_tag: wallaby-20221215T220154 glance_tag: wallaby-20230125T132411 +glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" kolla_toolbox_tag: wallaby-20221222T161624 magnum_tag: wallaby-20230111T103759 neutron_tag: wallaby-20221222T161624 -neutron_tls_proxy_tag: "{% raw %}{{ openstack_tag }}{% endraw %}" +neutron_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" nova_tag: wallaby-20230125T132411 octavia_tag: wallaby-20221222T161624 openvswitch_tag: wallaby-20221222T161624 From 078eecb5a06ea649039a701e0def93692208d556 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 31 Jan 2023 10:58:11 +0000 Subject: [PATCH 07/12] Add etcd image --- etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 1 + etc/kayobe/pulp.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 4fa1a998f..5cd653ffc 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -12,6 +12,7 @@ kolla_enable_cinder: true kolla_enable_cloudkitty: true kolla_enable_designate: true kolla_enable_elasticsearch_curator: true +kolla_enable_etcd: true kolla_enable_grafana: true kolla_enable_influxdb: true kolla_enable_ironic: true diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index f2a3d39da..6ba69e7c3 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -488,6 +488,7 @@ stackhpc_pulp_images: - dnsmasq - elasticsearch - elasticsearch-curator + - etcd - fluentd - glance-api - glance-base From 36945523e45dc2b08fae5dcf1f6c59a4e60c6ec4 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 31 Jan 2023 12:14:59 +0000 Subject: [PATCH 08/12] Add release note for etcd image --- releasenotes/notes/etcd-e4927551bf5d020c.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 releasenotes/notes/etcd-e4927551bf5d020c.yaml diff --git a/releasenotes/notes/etcd-e4927551bf5d020c.yaml b/releasenotes/notes/etcd-e4927551bf5d020c.yaml new file mode 100644 index 000000000..93b6344a6 --- /dev/null +++ b/releasenotes/notes/etcd-e4927551bf5d020c.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + Adds an ``etcd`` Kolla container image. This can be used for OpenStack + service coordination as a tooz backend, or for batched processing of switch + configuration in Networking Generic Switch (this requires a downstream NGS + patch). From a6dab96e531a3b69b9e2eeca2c8c5988d1c7e7d1 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 31 Jan 2023 13:30:37 +0000 Subject: [PATCH 09/12] Add container image tags for etcd --- etc/kayobe/kolla/globals.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index c30ccb09d..ff06967c4 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -6,6 +6,7 @@ docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg" {% if kolla_base_distro == 'centos' %} bifrost_tag: wallaby-20220921T100954 cinder_tag: wallaby-20230125T101644 +etcd_tag: wallaby-20230131T132432 glance_tag: wallaby-20230125T101644 glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" magnum_tag: wallaby-20230111T101726 @@ -16,6 +17,7 @@ rabbitmq_tag: wallaby-20221205T160115 bifrost_tag: wallaby-20220825T112231 cinder_tag: wallaby-20230125T132411 cloudkitty_tag: wallaby-20221215T220154 +etcd_tag: wallaby-20230131T123519 glance_tag: wallaby-20230125T132411 glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" kolla_toolbox_tag: wallaby-20221222T161624 From a5fc1fba4c3a8d15ca388f23176198b6e5af84ca Mon Sep 17 00:00:00 2001 From: Jakub Darmach Date: Tue, 31 Jan 2023 15:50:37 +0100 Subject: [PATCH 10/12] Magnum bump --- etc/kayobe/kolla/globals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index ff06967c4..fdca45d05 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -9,7 +9,7 @@ cinder_tag: wallaby-20230125T101644 etcd_tag: wallaby-20230131T132432 glance_tag: wallaby-20230125T101644 glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" -magnum_tag: wallaby-20230111T101726 +magnum_tag: wallaby-20230131T140614 neutron_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" nova_tag: wallaby-20230125T101644 rabbitmq_tag: wallaby-20221205T160115 From f89768cfad7e3dcec605083310567dd0ce476061 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 31 Jan 2023 13:30:37 +0000 Subject: [PATCH 11/12] Add container image tags for etcd --- etc/kayobe/kolla/globals.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 77c2252e6..1d7f7dd69 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -9,6 +9,7 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts {% if kolla_base_distro == 'centos' %} bifrost_tag: xena-20221128T101757 +etcd_tag: xena-20230201T095253 glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" magnum_tag: xena-20230131T144233 neutron_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" @@ -16,6 +17,7 @@ nova_tag: xena-20230120T115956 rabbitmq_tag: xena-20230105T141714 {% else %} bifrost_tag: xena-20221213T224057 +etcd_tag: xena-20230201T131415 glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" kolla_toolbox_tag: xena-20230104T145414 magnum_tag: xena-20230131T151601 From 4364e6c7ae2d707d8f7d9bcbe9dd42f93684135d Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 7 Feb 2023 10:03:54 +0100 Subject: [PATCH 12/12] OSSA-2023-002: update cinder, glance & nova images for CentOS & Ubuntu These images include backported fixes for OSSA-2023-002. https://security.openstack.org/ossa/OSSA-2023-002.html --- etc/kayobe/kolla/globals.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 1d7f7dd69..22e4fcc2a 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -9,21 +9,25 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts {% if kolla_base_distro == 'centos' %} bifrost_tag: xena-20221128T101757 +cinder_tag: xena-20230206T165215 etcd_tag: xena-20230201T095253 +glance_tag: xena-20230206T165215 glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" magnum_tag: xena-20230131T144233 neutron_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" -nova_tag: xena-20230120T115956 +nova_tag: xena-20230206T165215 rabbitmq_tag: xena-20230105T141714 {% else %} bifrost_tag: xena-20221213T224057 +cinder_tag: xena-20230206T165220 etcd_tag: xena-20230201T131415 +glance_tag: xena-20230206T165220 glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" kolla_toolbox_tag: xena-20230104T145414 magnum_tag: xena-20230131T151601 neutron_tag: xena-20230104T145414 neutron_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" -nova_tag: xena-20230104T145414 +nova_tag: xena-20230206T165220 octavia_tag: xena-20230104T145414 openvswitch_tag: xena-20230104T145414 ovn_tag: xena-20230104T145414