From 943e80a3fbeffdedf2b75cb9e3ba1a3af39fafcc Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 20 Jan 2023 16:18:23 +0100 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 cec411ce72e788f18235665847794e438870a987 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 25 Jan 2023 13:22:12 +0000 Subject: [PATCH 5/5] 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 021bcab21..1a83ffe56 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -9,14 +9,20 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts {% if kolla_base_distro == 'centos' %} bifrost_tag: yoga-20221007T134036 +cinder_tag: yoga-20230125T113143 +glance_tag: yoga-20230125T113143 magnum_tag: yoga-20230110T142129 neutron_tag: yoga-20230104T155323 +nova_tag: yoga-20230125T113143 ovn_tag: yoga-20230119T125748 prometheus_openstack_exporter_tag: yoga-20221128T164623 {% else %} bifrost_tag: yoga-20221215T142947 +cinder_tag: yoga-20230125T114437 +glance_tag: yoga-20230125T114437 magnum_tag: yoga-20230110T144737 neutron_tag: yoga-20230104T163118 +nova_tag: yoga-20230125T114437 {% endif %} om_enable_rabbitmq_high_availability: true