From 987f3be41d6ba6290e43284031973620be68947d Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 15 Feb 2023 14:32:43 +0000 Subject: [PATCH 01/36] Fix default when ANSIBLE_SERIAL not set You will see: ``` ERROR! Unexpected Exception, this is probably a bug: invalid literal for int() with base 10: '' ``` This is because the default filter only works on undefined variables and the lookup returns an empty string. We can use the boolean parameter on the default filter, see: https://jinja.palletsprojects.com/en/3.1.x/templates/#jinja-filters.default --- etc/kayobe/ansible/reboot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/ansible/reboot.yml b/etc/kayobe/ansible/reboot.yml index af01e5944..a284dd425 100644 --- a/etc/kayobe/ansible/reboot.yml +++ b/etc/kayobe/ansible/reboot.yml @@ -1,7 +1,7 @@ --- - name: Reboot the host hosts: seed-hypervisor:seed:overcloud:infra-vms - serial: "{{ lookup('env', 'ANSIBLE_SERIAL') | default(0) }}" + serial: "{{ lookup('env', 'ANSIBLE_SERIAL') | default(0, true) }}" tags: - reboot tasks: From e0570cd56953d967c1057d7bee0ee5b5acd43a37 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 22 Feb 2023 11:22:44 +0000 Subject: [PATCH 02/36] Bump the default worker count Hoping this will help with the slowness when pulling container images across multiple hosts. Credit to @m-bull for noticing the option: https://github.com/pulp/pulp-oci-images/commit/29c29df5bf218bfed80a52316356fc0dc89d7bf1 I've bumped pulp to 3.22 so that we don't have to force pull 3.21 to get an image with this feature. --- etc/kayobe/containers/pulp/settings.py | 1 + etc/kayobe/seed.yml | 5 ++++- releasenotes/notes/update-pulp-3.22-aa485b7e619cd380.yaml | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/update-pulp-3.22-aa485b7e619cd380.yaml diff --git a/etc/kayobe/containers/pulp/settings.py b/etc/kayobe/containers/pulp/settings.py index 90e64ed53..2afa6a08e 100644 --- a/etc/kayobe/containers/pulp/settings.py +++ b/etc/kayobe/containers/pulp/settings.py @@ -1,4 +1,5 @@ CONTENT_ORIGIN='{{ pulp_url }}' +ANALYTICS=False ANSIBLE_API_HOSTNAME='{{ pulp_url }}' ANSIBLE_CONTENT_HOSTNAME='{{ pulp_url }}/pulp/content' TOKEN_AUTH_DISABLED=True diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml index 8f497b915..b575ab82a 100644 --- a/etc/kayobe/seed.yml +++ b/etc/kayobe/seed.yml @@ -106,11 +106,14 @@ seed_pulp_container: image: pulp/pulp pre: "{{ kayobe_config_path }}/containers/pulp/pre.yml" post: "{{ kayobe_config_path }}/containers/pulp/post.yml" - tag: "{{ '3.21-https' if pulp_enable_tls | bool else '3.21' }}" + tag: "{{ '3.22-https' if pulp_enable_tls | bool else '3.22' }}" network_mode: host # Override deploy_containers_defaults.init == true to ensure # s6-overlay-suexec starts as pid 1 init: false + env: + PULP_CONTENT_WORKERS: "{{ ansible_facts.processor_vcpus * 2 + 1 }}" + PULP_API_WORKERS: "{{ ansible_facts.processor_vcpus * 2 + 1 }}" volumes: - /opt/kayobe/containers/pulp:/etc/pulp - pulp_storage:/var/lib/pulp diff --git a/releasenotes/notes/update-pulp-3.22-aa485b7e619cd380.yaml b/releasenotes/notes/update-pulp-3.22-aa485b7e619cd380.yaml new file mode 100644 index 000000000..d1235e62f --- /dev/null +++ b/releasenotes/notes/update-pulp-3.22-aa485b7e619cd380.yaml @@ -0,0 +1,7 @@ +--- +features: + - Upgrades Pulp from ``3.21`` to ``3.22``. + - Disables Pulp analytics. + - | + Sets Pulp worker based on available CPU cores. This may improve performance + when pulling container images to many hosts simultaneously. From b9cbe9f78766866d34ea8b2d23b0e122abe8e730 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 1 Mar 2023 14:22:41 +0000 Subject: [PATCH 03/36] Fix release train 02-2023 renos --- ...ase-train-02-2023-package-refresh-9de8049f8cb08a5e.yaml | 7 +++++++ ...in-02-2023-package-refresh-ubuntu-a9fe8a1c3c2f2796.yaml | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/releasenotes/notes/release-train-02-2023-package-refresh-9de8049f8cb08a5e.yaml b/releasenotes/notes/release-train-02-2023-package-refresh-9de8049f8cb08a5e.yaml index 72a3318e0..b8c79e5e2 100644 --- a/releasenotes/notes/release-train-02-2023-package-refresh-9de8049f8cb08a5e.yaml +++ b/releasenotes/notes/release-train-02-2023-package-refresh-9de8049f8cb08a5e.yaml @@ -5,14 +5,21 @@ features: Key packages to note are: * Kernel + * version: 4.18.0 * release: 448.el8 + * Libvirt + * version: 8.0.0 * release: 6.module_el8.7.0+1140+ff0772f9 + * OVS + * version: 2.17.0 * release: 71.el8s + * OVN + * version: 22.09.0 * release: 11.el8s diff --git a/releasenotes/notes/release-train-02-2023-package-refresh-ubuntu-a9fe8a1c3c2f2796.yaml b/releasenotes/notes/release-train-02-2023-package-refresh-ubuntu-a9fe8a1c3c2f2796.yaml index 722b68034..0ea0b4c9f 100644 --- a/releasenotes/notes/release-train-02-2023-package-refresh-ubuntu-a9fe8a1c3c2f2796.yaml +++ b/releasenotes/notes/release-train-02-2023-package-refresh-ubuntu-a9fe8a1c3c2f2796.yaml @@ -5,11 +5,16 @@ features: Key packages to note are: * Libvirt (unchanged since last container build) + * version: 6.0.0 * release: 0ubuntu8.16 + * OVS + * version: 2.17.3 * release: 0ubuntu0.22.04.1~cloud0 + * OVN (unchanged since last container build) + * version: 22.03.0 * release: 0ubuntu1~cloud0 From 0a2a0e15d9eccc113dad9b5a6d12bd0bac0e262b Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 1 Mar 2023 14:24:33 +0000 Subject: [PATCH 04/36] release notes: Remove default_branch config option This option seemed to cause a few problems: 1. The GitHub PR CI used the release branch, so does not test changes to release notes 2. Only tags that have not yet been merged to later release branches appeared in the release notes. Things look better after removing the option. --- releasenotes/config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/releasenotes/config.yaml b/releasenotes/config.yaml index 5dd9a157a..f42aaa466 100644 --- a/releasenotes/config.yaml +++ b/releasenotes/config.yaml @@ -1,4 +1,3 @@ --- # This needs to be updated to the latest release. -default_branch: stackhpc/xena release_tag_re: stackhpc/11\.\d+\.\d+\.\d From ac835014d23cf97a961dbe9dd732baa1dec8c37a Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 1 Mar 2023 14:30:49 +0000 Subject: [PATCH 05/36] Use yoga upper constraints for releasenotes tox env This allows building on Python 3.10, and is what we do for the docs env already. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index b4dd6e620..a34da4934 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,7 @@ commands = allowlist_externals = rm skip_install = true deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga} -r{toxinidir}/releasenotes/requirements.txt commands = rm -rf releasenotes/build/html From 3f2b4d469fbb74ac9c90554facd6519937bacc00 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 1 Mar 2023 14:54:16 +0000 Subject: [PATCH 06/36] Run doc8 and reno lint in pep8 tox env --- doc/source/configuration/host-images.rst | 2 +- doc/source/configuration/monitoring.rst | 2 +- doc/source/configuration/release-train.rst | 8 ++++---- doc/source/configuration/walled-garden.rst | 2 +- doc/source/contributor/environments/ci-multinode.rst | 8 ++++---- test-requirements.txt | 2 ++ tox.ini | 2 ++ 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/doc/source/configuration/host-images.rst b/doc/source/configuration/host-images.rst index cfa5fe678..ba35a244f 100644 --- a/doc/source/configuration/host-images.rst +++ b/doc/source/configuration/host-images.rst @@ -43,7 +43,7 @@ The 3 partitions are: * p0: EFI ESP bootloader * p1: EFI BSP * p2: LVM PV (``rootpv``) - + The LVM Logical Volumes are: ============== ================== ========= diff --git a/doc/source/configuration/monitoring.rst b/doc/source/configuration/monitoring.rst index c2384ba93..2b336c699 100644 --- a/doc/source/configuration/monitoring.rst +++ b/doc/source/configuration/monitoring.rst @@ -126,4 +126,4 @@ need to be set, and the proxy URL sould be set or removed. If you want to add an alerting rule, there are many good examples of alerts are available `here `__. They simply need to be added to one of the ``*.rules`` files in the prometheus configuration -directory. \ No newline at end of file +directory. diff --git a/doc/source/configuration/release-train.rst b/doc/source/configuration/release-train.rst index af1e7b3f9..d4757f54f 100644 --- a/doc/source/configuration/release-train.rst +++ b/doc/source/configuration/release-train.rst @@ -232,7 +232,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 @@ -241,17 +241,17 @@ 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 diff --git a/doc/source/configuration/walled-garden.rst b/doc/source/configuration/walled-garden.rst index 0df8ef8b5..9a45ea4db 100644 --- a/doc/source/configuration/walled-garden.rst +++ b/doc/source/configuration/walled-garden.rst @@ -49,7 +49,7 @@ In some environments we have found that squid’s preference for IPv6 can cause problems. It can be forced to prefer IPv4, by adding the following in ``etc/kayobe/containers/squid_proxy/squid.conf``: -.. code:: none +.. code:: dns_v4_first on diff --git a/doc/source/contributor/environments/ci-multinode.rst b/doc/source/contributor/environments/ci-multinode.rst index 72aecc3e7..0dd787140 100644 --- a/doc/source/contributor/environments/ci-multinode.rst +++ b/doc/source/contributor/environments/ci-multinode.rst @@ -1,5 +1,5 @@ ========================== -Multinode Test Environment +Multinode Test Environment ========================== Set up hosts @@ -21,7 +21,7 @@ Basic Kayobe Setup 2. ``sudo dnf install -y python3-virtualenv`` 3. ``mkdir src`` and ``cd src`` 4. Clone https://github.com/stackhpc/stackhpc-kayobe-config.git, then checkout - commit f31df6256f1b1fea99c84547d44f06c4cb74b161 + commit f31df6256f1b1fea99c84547d44f06c4cb74b161 5. ``cd ..`` and ``mkdir venvs`` 6. ``virtualenv venvs/kayobe`` and source ``venvs/kayobe/bin/activate`` 7. ``pip install -U pip`` @@ -39,8 +39,8 @@ Config changes 4. Also under vxlan_interfaces, check vxlan_dstport is not 4789 (this causes conflicts, change to 4790) 5. In /etc/kayobe/environments/ci-multinode/tf-networks.yml, edit admin_ips so - that the compute and controller IPs line up with the - instances that were created earlier, remove the other IPs for seed and + that the compute and controller IPs line up with the + instances that were created earlier, remove the other IPs for seed and cephOSD 6. In /etc/kayobe/environments/ci-multinode/network-allocation.yml, remove all the entries and just assign ``aio_ips:`` an empty set ``[]`` diff --git a/test-requirements.txt b/test-requirements.txt index 333d31836..d7f05bb0d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,3 +3,5 @@ # process, which may cause wedges in the gate later. yamllint # GPLv3 +doc8 # Apache-2.0 +reno>=3.4.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index b4dd6e620..7778e421d 100644 --- a/tox.ini +++ b/tox.ini @@ -12,6 +12,8 @@ deps = [testenv:pep8] commands = yamllint etc/kayobe + reno lint + doc8 README.rst doc/source --ignore D001 # StackHPC Kayobe configuration release notes: [testenv:releasenotes] From f52fe3fb0f6539013165c1e1ebd2074adfa6927f Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 3 Feb 2023 18:06:28 +0000 Subject: [PATCH 07/36] Reduce concurrency --- .automation.conf/config.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.automation.conf/config.sh b/.automation.conf/config.sh index e8b88728b..bfb98f9b0 100644 --- a/.automation.conf/config.sh +++ b/.automation.conf/config.sh @@ -19,10 +19,15 @@ if [ ! -z ${KAYOBE_ENVIRONMENT:+x} ]; then # Seem to get servers failing to spawn with higher concurrency export TEMPEST_CONCURRENCY=1 fi + if [[ "$KAYOBE_ENVIRONMENT" =~ "ci-multinode" ]]; then - export KAYOBE_AUTOMATION_TEMPEST_LOADLIST=tempest-full - export KAYOBE_AUTOMATION_TEMPEST_SKIPLIST=ci-multinode + # SMSLab is currently running with 1G switches. This causes tests using volumes and images to fail if + # the concurrency is set too high. + export TEMPEST_CONCURRENCY=2 + export KAYOBE_AUTOMATION_TEMPEST_LOADLIST=tempest-full + export KAYOBE_AUTOMATION_TEMPEST_SKIPLIST=ci-multinode fi + fi if [[ -z "${KAYOBE_AUTOMATION_TEMPEST_CONF_OVERRIDES:+x}" ]] || [[ ! -e "${KAYOBE_AUTOMATION_TEMPEST_CONF_OVERRIDES}" ]]; then From b1a3bb0fdaf8bbfd9cca7ceb46d2362ea69fcb43 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 8 Feb 2023 09:55:02 +0000 Subject: [PATCH 08/36] Configure tunnel mtu in neutron This determines the default mtu that neutron will use when networks are created. --- etc/kayobe/environments/ci-multinode/kolla/config/neutron.conf | 3 +++ .../ci-multinode/kolla/config/neutron/ml2_conf.ini | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 etc/kayobe/environments/ci-multinode/kolla/config/neutron.conf create mode 100644 etc/kayobe/environments/ci-multinode/kolla/config/neutron/ml2_conf.ini diff --git a/etc/kayobe/environments/ci-multinode/kolla/config/neutron.conf b/etc/kayobe/environments/ci-multinode/kolla/config/neutron.conf new file mode 100644 index 000000000..265f67b26 --- /dev/null +++ b/etc/kayobe/environments/ci-multinode/kolla/config/neutron.conf @@ -0,0 +1,3 @@ +[DEFAULT] +global_physnet_mtu = {{ tunnel_net_name | net_mtu }} + diff --git a/etc/kayobe/environments/ci-multinode/kolla/config/neutron/ml2_conf.ini b/etc/kayobe/environments/ci-multinode/kolla/config/neutron/ml2_conf.ini new file mode 100644 index 000000000..ff31f09a5 --- /dev/null +++ b/etc/kayobe/environments/ci-multinode/kolla/config/neutron/ml2_conf.ini @@ -0,0 +1,3 @@ +[ml2] +path_mtu = {{ tunnel_net_name | net_mtu }} + From 54c8d2835f2fd71faf7072030a0f8909cc3198f3 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 8 Feb 2023 12:08:12 +0000 Subject: [PATCH 09/36] Reduce tempest concurrency to 1 --- .automation.conf/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.automation.conf/config.sh b/.automation.conf/config.sh index bfb98f9b0..4ca6b3b78 100644 --- a/.automation.conf/config.sh +++ b/.automation.conf/config.sh @@ -23,7 +23,7 @@ if [ ! -z ${KAYOBE_ENVIRONMENT:+x} ]; then if [[ "$KAYOBE_ENVIRONMENT" =~ "ci-multinode" ]]; then # SMSLab is currently running with 1G switches. This causes tests using volumes and images to fail if # the concurrency is set too high. - export TEMPEST_CONCURRENCY=2 + export TEMPEST_CONCURRENCY=1 export KAYOBE_AUTOMATION_TEMPEST_LOADLIST=tempest-full export KAYOBE_AUTOMATION_TEMPEST_SKIPLIST=ci-multinode fi From f0c6d4af00cb1bab6329f78dd599e458cd9e81c2 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 8 Feb 2023 12:08:37 +0000 Subject: [PATCH 10/36] Bump timeouts to account for ceph being slow --- .automation.conf/tempest/tempest-ci-multinode.overrides.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.automation.conf/tempest/tempest-ci-multinode.overrides.conf b/.automation.conf/tempest/tempest-ci-multinode.overrides.conf index 5cd61d03b..0007e5d97 100644 --- a/.automation.conf/tempest/tempest-ci-multinode.overrides.conf +++ b/.automation.conf/tempest/tempest-ci-multinode.overrides.conf @@ -23,8 +23,12 @@ volume_backed_live_migration = true console_output = true [volume] +build_timeout = 600 min_microversion = 3.0 max_microversion = 3.66 +[image] +build_timeout = 600 + [dashboard] dashboard_url = http://192.168.39.2 From 3c3c3664db3026676b5bef4b54ab53b173e312f2 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 8 Feb 2023 12:09:36 +0000 Subject: [PATCH 11/36] Bump MTU on external network We need this to match the global_physical_network_mtu set in neutron.conf for some tests to pass correctly. --- etc/kayobe/environments/ci-multinode/networks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/environments/ci-multinode/networks.yml b/etc/kayobe/environments/ci-multinode/networks.yml index 86406bfad..e6ef17fad 100644 --- a/etc/kayobe/environments/ci-multinode/networks.yml +++ b/etc/kayobe/environments/ci-multinode/networks.yml @@ -81,7 +81,7 @@ internal_vlan: 101 # External network external_cidr: 192.168.38.0/24 -external_mtu: 1350 +external_mtu: 1450 external_allocation_pool_start: 192.168.38.3 external_allocation_pool_end: 192.168.38.128 external_vlan: 102 From 210c3c01492af0c46b52d98866f7cbefeb0a922a Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 10 Feb 2023 18:36:23 +0000 Subject: [PATCH 12/36] Set storage protocol Resolves a few tempest failures: ``` 2023-02-10 18:34:25.310 590 INFO default [-] {1} tempest.api.volume.admin.test_volume_types.VolumeTypesTest.test_volume_crud_with_volume_type_and_extra_specs ... success [4.531s] 2023-02-10 18:34:46.163 590 INFO default [-] {1} tempest.api.volume.test_volume_delete_cascade.VolumesDeleteCascade.test_volume_from_snapshot_cascade_delete ... skip [0.000s]: b'Skip because of Bug#1677525' 2023-02-10 18:34:48.844 590 INFO default [-] {1} tempest.api.volume.test_volumes_backup.VolumesBackupsTest.test_volume_backup_create_get_detailed_list_restore_delete ... skip [0.000s]: b'ceph does not support arbitrary container names' ``` --- .automation.conf/tempest/tempest-ci-multinode.overrides.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/.automation.conf/tempest/tempest-ci-multinode.overrides.conf b/.automation.conf/tempest/tempest-ci-multinode.overrides.conf index 0007e5d97..9c6398074 100644 --- a/.automation.conf/tempest/tempest-ci-multinode.overrides.conf +++ b/.automation.conf/tempest/tempest-ci-multinode.overrides.conf @@ -23,6 +23,7 @@ volume_backed_live_migration = true console_output = true [volume] +storage_protocol = ceph build_timeout = 600 min_microversion = 3.0 max_microversion = 3.66 From af2dcdb148eeef621a843f4f07539f4f38850739 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 1 Mar 2023 15:53:29 +0000 Subject: [PATCH 13/36] Clarify which exchanges should remain after the forced reset of RabbitMQ --- doc/source/operations/rabbitmq.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/source/operations/rabbitmq.rst b/doc/source/operations/rabbitmq.rst index e678fbed9..dc9c3404b 100644 --- a/doc/source/operations/rabbitmq.rst +++ b/doc/source/operations/rabbitmq.rst @@ -128,6 +128,8 @@ Check to see if all OpenStack queues and exchanges have been removed from the Ra kayobe overcloud host command run --limit controllers --show-output --command 'docker exec rabbitmq rabbitmqctl list_queues name' kayobe overcloud host command run --limit controllers --show-output --command 'docker exec rabbitmq rabbitmqctl list_exchanges name' +There should be no queus listed, and the only exchanges listed should start with `amq.`. + Start the OpenStack services which use RabbitMQ. Note that this will start all matching services, even if they weren't running prior to starting this procedure. From d8ac5c749601be1ab3bca06d929f988bf996cace Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 1 Mar 2023 15:09:26 +0000 Subject: [PATCH 14/36] Change fix-networking.yml so it doesn't overwrite all of /etc/hosts --- etc/kayobe/ansible/fix-networking.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/etc/kayobe/ansible/fix-networking.yml b/etc/kayobe/ansible/fix-networking.yml index f24be3862..0a1736702 100644 --- a/etc/kayobe/ansible/fix-networking.yml +++ b/etc/kayobe/ansible/fix-networking.yml @@ -11,11 +11,10 @@ ansible_ssh_common_args: "-o StrictHostKeyChecking=no" tasks: - name: Ensure `hosts` file contains pulp entries - ansible.builtin.copy: - content: | - 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 - ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 + blockinfile: + path: /etc/hosts + marker_begin: BEGIN Kayobe Pulp entries + block: | 10.0.0.34 pelican pelican.service.compute.sms-lab.cloud 10.205.3.187 pulp-server pulp-server.internal.sms-cloud - dest: /etc/hosts become: true From 51017f8cdfd08c06c2b5a8ef85d1ecbfd2a29380 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 1 Mar 2023 16:02:08 +0000 Subject: [PATCH 15/36] Update doc/source/operations/rabbitmq.rst Co-authored-by: Mark Goddard --- doc/source/operations/rabbitmq.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/operations/rabbitmq.rst b/doc/source/operations/rabbitmq.rst index dc9c3404b..12fd5a789 100644 --- a/doc/source/operations/rabbitmq.rst +++ b/doc/source/operations/rabbitmq.rst @@ -128,7 +128,7 @@ Check to see if all OpenStack queues and exchanges have been removed from the Ra kayobe overcloud host command run --limit controllers --show-output --command 'docker exec rabbitmq rabbitmqctl list_queues name' kayobe overcloud host command run --limit controllers --show-output --command 'docker exec rabbitmq rabbitmqctl list_exchanges name' -There should be no queus listed, and the only exchanges listed should start with `amq.`. +There should be no queues listed, and the only exchanges listed should start with `amq.`. Start the OpenStack services which use RabbitMQ. Note that this will start all matching services, even if they weren't running prior to starting this From 79bfa3b7bba46052272149703890c9fb70f8b8ce Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 1 Mar 2023 16:23:55 +0000 Subject: [PATCH 16/36] Correct marker --- etc/kayobe/ansible/fix-networking.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/ansible/fix-networking.yml b/etc/kayobe/ansible/fix-networking.yml index 0a1736702..c992be181 100644 --- a/etc/kayobe/ansible/fix-networking.yml +++ b/etc/kayobe/ansible/fix-networking.yml @@ -13,7 +13,7 @@ - name: Ensure `hosts` file contains pulp entries blockinfile: path: /etc/hosts - marker_begin: BEGIN Kayobe Pulp entries + marker: "# {mark} Kayobe Pulp entries" block: | 10.0.0.34 pelican pelican.service.compute.sms-lab.cloud 10.205.3.187 pulp-server pulp-server.internal.sms-cloud From b1f78d34b5fc6602d94a15969bf24c5bd83f0bf9 Mon Sep 17 00:00:00 2001 From: Dawud <7688823+technowhizz@users.noreply.github.com> Date: Wed, 1 Mar 2023 19:19:18 +0000 Subject: [PATCH 17/36] Fix InstanceDown alert (#419) Fixes the InstanceDown alerting rule wait time to be consistent with the alert message. The alert message says "for 5 minutes" but the rule was set to wait for 1 minute. --- etc/kayobe/kolla/config/prometheus/system.rules | 2 +- .../notes/fixes-InstanceDown-Alert-570a295e3d5006f7.yaml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fixes-InstanceDown-Alert-570a295e3d5006f7.yaml diff --git a/etc/kayobe/kolla/config/prometheus/system.rules b/etc/kayobe/kolla/config/prometheus/system.rules index be1343b82..f693a250c 100644 --- a/etc/kayobe/kolla/config/prometheus/system.rules +++ b/etc/kayobe/kolla/config/prometheus/system.rules @@ -53,7 +53,7 @@ groups: - alert: InstanceDown expr: up{job="node"} == 0 - for: 1m + for: 5m labels: severity: alert annotations: diff --git a/releasenotes/notes/fixes-InstanceDown-Alert-570a295e3d5006f7.yaml b/releasenotes/notes/fixes-InstanceDown-Alert-570a295e3d5006f7.yaml new file mode 100644 index 000000000..60be7d77b --- /dev/null +++ b/releasenotes/notes/fixes-InstanceDown-Alert-570a295e3d5006f7.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Fixes the InstanceDown alerting rule wait time to be consistent with + the alert message. The alert message says "for 5 minutes" but the rule + was set to wait for 1 minute. + From 9df33a626e0d809790d067a05d1e3844cb16e90b Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 3 Mar 2023 16:40:31 +0100 Subject: [PATCH 18/36] Build Neutron from stackhpc fork This is required to include our IPv6 metadata workaround. --- etc/kayobe/kolla.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index d049150d4..3ca419597 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -148,6 +148,10 @@ kolla_sources: type: git location: https://github.com/stackhpc/magnum.git reference: stackhpc/wallaby + neutron-base: + type: git + location: https://github.com/stackhpc/neutron.git + reference: stackhpc/{{ openstack_release }} neutron-base-plugin-networking-generic-switch: type: git location: https://github.com/stackhpc/networking-generic-switch.git From 936adad18f779f8efc2e7a775060b975088cda67 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 3 Mar 2023 17:02:30 +0000 Subject: [PATCH 19/36] 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 20/36] 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 21/36] 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 22/36] 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 23/36] 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 ed1e1f1c140cf479c1dc46a81cfd27e937b3df0b Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Sat, 4 Mar 2023 16:12:07 +0100 Subject: [PATCH 24/36] Bump Neutron to include IPv6 metadata workaround --- 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 02f46e14e..30f3c49e5 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -5,8 +5,10 @@ docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg" {% if kolla_base_distro == 'centos' %} bifrost_tag: wallaby-20230207T194135 +neutron_tag: wallaby-20230303T174325 {% else %} bifrost_tag: wallaby-20230215T160405 +neutron_tag: wallaby-20230303T213058 {% 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 25/36] 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 26/36] 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 27/36] 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 388c3811ac1923bb52b8fc78f0f7e220d69f03f5 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 7 Mar 2023 21:41:32 +0100 Subject: [PATCH 28/36] Bump Neutron to include IPv6 metadata workaround --- etc/kayobe/kolla/globals.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index d2e1a4f0d..6a38da4ab 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -9,10 +9,10 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts {% if kolla_base_distro == 'centos' %} bifrost_tag: xena-20230214T165534 -neutron_tag: xena-20230222T141338 +neutron_tag: xena-20230307T142413 {% else %} bifrost_tag: xena-20230215T195824 -neutron_tag: xena-20230222T150855 +neutron_tag: xena-20230307T142414 {% endif %} glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" From 0f40c79cac6845da83d4e9049c539e5b02a3be9d Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 8 Mar 2023 08:56:02 +0100 Subject: [PATCH 29/36] 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 30/36] 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 31/36] 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 c88c90e4c04156ff28bcdce341452b4a1093cb23 Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Wed, 8 Mar 2023 12:53:43 +0100 Subject: [PATCH 32/36] 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 6c8f27ca2..5cf57682c 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -275,6 +275,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 %} nova_base_footer: | # Fix for https://bugs.launchpad.net/nova/+bug/1955035, i.e. # https://bugzilla.redhat.com/show_bug.cgi?id=2090752 on c8s 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 f09071e3f5ac637df6db7d9230dbf9c5d3d27e35 Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Wed, 8 Mar 2023 14:10:08 +0100 Subject: [PATCH 33/36] Bump up Keystone's image tag for Ubuntu --- etc/kayobe/kolla/globals.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 6a38da4ab..67c5b1bb6 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -1,8 +1,8 @@ # yamllint disable-file --- -# To work around issue of trying to install docker from -# empty pulp server, use upstream docker dnf repo on +# To work around issue of trying to install docker from +# empty pulp server, use upstream docker dnf repo on # non-overcloud hosts enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts.os_family == 'Debian' }}"{% endraw %} @@ -12,6 +12,7 @@ bifrost_tag: xena-20230214T165534 neutron_tag: xena-20230307T142413 {% else %} bifrost_tag: xena-20230215T195824 +keystone_tag: xena-20230308T120251 neutron_tag: xena-20230307T142414 {% endif %} From 7748d7b61492efb24edb799ca0866fcc5bc64608 Mon Sep 17 00:00:00 2001 From: Dawud <7688823+technowhizz@users.noreply.github.com> Date: Tue, 14 Mar 2023 10:35:56 +0000 Subject: [PATCH 34/36] Add unit (GiB) to LowMemory alert (#437) Add unit (GiB) to LowMemory alert --- etc/kayobe/kolla/config/prometheus/system.rules | 2 +- .../notes/low-memory-alert-units-a6fde380ff9b7839.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/low-memory-alert-units-a6fde380ff9b7839.yaml diff --git a/etc/kayobe/kolla/config/prometheus/system.rules b/etc/kayobe/kolla/config/prometheus/system.rules index f693a250c..c82bed16e 100644 --- a/etc/kayobe/kolla/config/prometheus/system.rules +++ b/etc/kayobe/kolla/config/prometheus/system.rules @@ -22,7 +22,7 @@ groups: severity: alert annotations: summary: "Prometheus exporter at {{ $labels.instance }} reports low memory" - description: "Available memory is {{ $value }}." + description: "Available memory is {{ $value }} GiB." - alert: HostOomKillDetected expr: increase(node_vmstat_oom_kill[5m]) > 0 diff --git a/releasenotes/notes/low-memory-alert-units-a6fde380ff9b7839.yaml b/releasenotes/notes/low-memory-alert-units-a6fde380ff9b7839.yaml new file mode 100644 index 000000000..4732bb759 --- /dev/null +++ b/releasenotes/notes/low-memory-alert-units-a6fde380ff9b7839.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Add unit to LowMemory alert description. From 30ae4070e21c4843c3fb26c23f587455860d75bb Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 15 Mar 2023 13:59:42 +0000 Subject: [PATCH 35/36] Add tags for Blazar and Caso images --- 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 b09669099..6cc3ee166 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -9,11 +9,17 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts {% if kolla_base_distro == 'centos' %} bifrost_tag: yoga-20230217T160618 +blazar_tag: yoga-20230315T125157 +caso_tag: yoga-20230315T125157 neutron_tag: yoga-20230309T123152 {% elif kolla_base_distro == 'rocky' %} bifrost_tag: yoga-20230310T194732 +blazar_tag: yoga-20230315T130918 +caso_tag: yoga-20230315T130918 {% else %} bifrost_tag: yoga-20230220T184947 +blazar_tag: yoga-20230315T125441 +caso_tag: yoga-20230315T125441 neutron_tag: yoga-20230309T123143 {% endif %} From fb1ad08a0105d205e0dcba9ad4c9cffa02282c76 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 15 Mar 2023 14:24:52 +0000 Subject: [PATCH 36/36] CI: Fix doc8 newline issues --- doc/source/contributor/environments/aufn-ceph.rst | 2 +- doc/source/contributor/environments/index.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/contributor/environments/aufn-ceph.rst b/doc/source/contributor/environments/aufn-ceph.rst index 18ca0d531..bf3f6a27b 100644 --- a/doc/source/contributor/environments/aufn-ceph.rst +++ b/doc/source/contributor/environments/aufn-ceph.rst @@ -198,4 +198,4 @@ We then use the CLI to create a keypair, floating IP and test VM: openstack server add floating ip test-vm-1 `openstack floating ip list -c ID -f value` openstack server list -which will create a VM named ``test-vm-1`` with a Cirros OS iamge and a default login password of 'gocubsgo'. \ No newline at end of file +which will create a VM named ``test-vm-1`` with a Cirros OS iamge and a default login password of 'gocubsgo'. diff --git a/doc/source/contributor/environments/index.rst b/doc/source/contributor/environments/index.rst index 4e0ba4708..888608973 100644 --- a/doc/source/contributor/environments/index.rst +++ b/doc/source/contributor/environments/index.rst @@ -9,4 +9,4 @@ The following Kayobe environments are provided with this configuration: ci-aio ci-builder ci-multinode - aufn-ceph \ No newline at end of file + aufn-ceph