diff --git a/.github/workflows/runner-selector.yml b/.github/workflows/runner-selector.yml index 5c7907582..f825ec604 100644 --- a/.github/workflows/runner-selector.yml +++ b/.github/workflows/runner-selector.yml @@ -37,7 +37,7 @@ jobs: - name: Set output for container image build runner run: echo "Setting runner for ${{ inputs.runner_env }} -> ${{ vars.RUNS_ON_TARGET_CONTAINER_IMAGE_BUILDER }}" - + - id: container-image-build-runner run: echo "runner_name_container_image_build=${{ vars.RUNS_ON_TARGET_CONTAINER_IMAGE_BUILDER }}" >> $GITHUB_OUTPUT diff --git a/etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh b/etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh index f8014b146..9dbbeb990 100755 --- a/etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh +++ b/etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh @@ -50,7 +50,7 @@ if [[ ! -d kayobe ]]; then python3 -m venv kayobe fi # NOTE: Virtualenv's activate and deactivate scripts reference an -# unbound variable. +# unbound variable. set +u source kayobe/bin/activate set -u @@ -121,7 +121,7 @@ deactivate set -u $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/configure-openstack.sh $BASE_PATH -# Create a test vm +# Create a test vm VENV_DIR=$BASE_PATH/venvs/openstack if [[ ! -d $VENV_DIR ]]; then python3 -m venv $VENV_DIR diff --git a/etc/kayobe/environments/aufn-ceph/configure-openstack.sh b/etc/kayobe/environments/aufn-ceph/configure-openstack.sh index 1c7433e8a..3bac0a351 100755 --- a/etc/kayobe/environments/aufn-ceph/configure-openstack.sh +++ b/etc/kayobe/environments/aufn-ceph/configure-openstack.sh @@ -6,13 +6,13 @@ cd $BASE_PATH/src/ [[ -d openstack-config ]] || git clone https://github.com/stackhpc/openstack-config-multinode.git openstack-config cd openstack-config if [[ ! -d $VENV_DIR ]]; then - # Using virtualenv causes a strange bug with python3.6 where + # Using virtualenv causes a strange bug with python3.6 where # nested virtual env creation leads to envs without pip... # virtualenv $VENV_DIR python3 -m venv $VENV_DIR fi -# NOTE: Virtualenv's activate and deactivate scripts reference an unbound variable. +# NOTE: Virtualenv's activate and deactivate scripts reference an unbound variable. set +u source $VENV_DIR/bin/activate set -u diff --git a/etc/kayobe/environments/ci-multinode/kolla/config/keepalived/keepalived.conf b/etc/kayobe/environments/ci-multinode/kolla/config/keepalived/keepalived.conf index 7a18dbbcf..71b1682cb 100644 --- a/etc/kayobe/environments/ci-multinode/kolla/config/keepalived/keepalived.conf +++ b/etc/kayobe/environments/ci-multinode/kolla/config/keepalived/keepalived.conf @@ -12,7 +12,7 @@ vrrp_instance kolla_internal_vip_{{ keepalived_virtual_router_id }} { interface {{ api_interface }} virtual_router_id {{ keepalived_virtual_router_id }} priority {{ groups['loadbalancer'].index(inventory_hostname) + 1 }} - advert_int 3 # Increase advert interval from 1 to 3 as there was a lot of jumping amongst controllers on the internal network + advert_int 3 # Increase advert interval from 1 to 3 as there was a lot of jumping amongst controllers on the internal network {% if keepalived_traffic_mode == 'unicast' %} unicast_src_ip {{ api_interface_address }} {% if groups['loadbalancer'] | length > 1 %} diff --git a/etc/kayobe/inventory/group_vars/overcloud/stackhpc-repos b/etc/kayobe/inventory/group_vars/overcloud/stackhpc-repos index 442a9e068..22fa09487 100644 --- a/etc/kayobe/inventory/group_vars/overcloud/stackhpc-repos +++ b/etc/kayobe/inventory/group_vars/overcloud/stackhpc-repos @@ -1,6 +1,6 @@ --- # Only use local pulp mirrors for overcloud hosts -# to avoid situations where the seed-hypervisor +# to avoid situations where the seed-hypervisor # tries to use a local pulp repo on the seed VM # before the seed vm has been provisioned stackhpc_repos_enabled: true diff --git a/etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.yml.example b/etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.yml.example index 4a3501474..0548a8286 100644 --- a/etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.yml.example +++ b/etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.yml.example @@ -16,7 +16,7 @@ route: - severity=~"critical|alert" receiver: 'slack-critical-notifications' - + receivers: - name: 'slack-notifications' slack_configs: @@ -24,7 +24,7 @@ receivers: actions: - type: button text: 'Silence 🔕' - url: {{ '{% raw %}' }}{% raw %} '{{ template "__alert_silence_link" . }}' + url: {{ '{% raw %}' }}{% raw %} '{{ template "__alert_silence_link" . }}' {% endraw %}{{ '{% endraw %}' }} send_resolved: true http_config: @@ -35,7 +35,7 @@ receivers: actions: - type: button text: 'Silence 🔕' - url: {{ '{% raw %}' }}{% raw %} '{{ template "__alert_silence_link" . }}' + url: {{ '{% raw %}' }}{% raw %} '{{ template "__alert_silence_link" . }}' {% endraw %}{{ '{% endraw %}' }} send_resolved: true http_config: diff --git a/releasenotes/notes/add-caso-f36b98453be10169.yaml b/releasenotes/notes/add-caso-f36b98453be10169.yaml index fec9b8286..ee71bcf1f 100644 --- a/releasenotes/notes/add-caso-f36b98453be10169.yaml +++ b/releasenotes/notes/add-caso-f36b98453be10169.yaml @@ -5,4 +5,4 @@ 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. + downstream by StackHPC. diff --git a/releasenotes/notes/add-rekey-playbook-0065c5057b1639f8.yaml b/releasenotes/notes/add-rekey-playbook-0065c5057b1639f8.yaml index 5e75a51ad..d1edf25a4 100644 --- a/releasenotes/notes/add-rekey-playbook-0065c5057b1639f8.yaml +++ b/releasenotes/notes/add-rekey-playbook-0065c5057b1639f8.yaml @@ -1,5 +1,5 @@ --- features: - | - Added the ``rekey-hosts.yml`` playbook to automatically rotate the SSH + Added the ``rekey-hosts.yml`` playbook to automatically rotate the SSH keys on all hosts. diff --git a/releasenotes/notes/add-rocky-9-packages-43074cb3367171a5.yaml b/releasenotes/notes/add-rocky-9-packages-43074cb3367171a5.yaml index a202b9ecd..f9c6bd534 100644 --- a/releasenotes/notes/add-rocky-9-packages-43074cb3367171a5.yaml +++ b/releasenotes/notes/add-rocky-9-packages-43074cb3367171a5.yaml @@ -3,5 +3,5 @@ features: - | Add the package repository configuration required for Rocky Linux 9 support. - + Add CI for Rocky 9 hosts. diff --git a/releasenotes/notes/add-vm-overcloud-support-92baa7c2ce87ac1d.yaml b/releasenotes/notes/add-vm-overcloud-support-92baa7c2ce87ac1d.yaml index a3ebacc1f..cabf7a891 100644 --- a/releasenotes/notes/add-vm-overcloud-support-92baa7c2ce87ac1d.yaml +++ b/releasenotes/notes/add-vm-overcloud-support-92baa7c2ce87ac1d.yaml @@ -4,4 +4,4 @@ features: Adds support for using a VMs as compute and controller nodes in the ``ci-multinode`` environment by dynamically setting the MTU of the networks in networks.yml and removing the static definition of the network - interfaces for the compute and controller groups. + interfaces for the compute and controller groups. diff --git a/releasenotes/notes/bump-rocky-9-90412343a29bc45b.yaml b/releasenotes/notes/bump-rocky-9-90412343a29bc45b.yaml index 165b40751..cd8bbb59c 100644 --- a/releasenotes/notes/bump-rocky-9-90412343a29bc45b.yaml +++ b/releasenotes/notes/bump-rocky-9-90412343a29bc45b.yaml @@ -1,4 +1,4 @@ --- upgrade: - | - Bumped rocky 9 package versions due to missing snapshot + Bumped rocky 9 package versions due to missing snapshot diff --git a/releasenotes/notes/bumps-redfish-exporter-to-v2-11032fb9dde36283.yaml b/releasenotes/notes/bumps-redfish-exporter-to-v2-11032fb9dde36283.yaml index ddf1d58eb..6ef30e11a 100644 --- a/releasenotes/notes/bumps-redfish-exporter-to-v2-11032fb9dde36283.yaml +++ b/releasenotes/notes/bumps-redfish-exporter-to-v2-11032fb9dde36283.yaml @@ -10,6 +10,6 @@ features: fixes: - Fixes various issues with the redfish exporter dashboard. upgrade: - - | + - | Increases default ``os_capacity_scrape_interval`` to ``5m``. If you already customise this please move to the new ``stackhpc_os_capacity_scrape_interval`` variable. diff --git a/releasenotes/notes/disable-heat-03f3ac52ac610223.yaml b/releasenotes/notes/disable-heat-03f3ac52ac610223.yaml index b5c557161..9a5e8eda5 100644 --- a/releasenotes/notes/disable-heat-03f3ac52ac610223.yaml +++ b/releasenotes/notes/disable-heat-03f3ac52ac610223.yaml @@ -1,7 +1,7 @@ --- features: - | - The Heat OpenStack service is now disabled by default. + The Heat OpenStack service is now disabled by default. upgrade: - | The Heat service is now disabled by default. This behaviour can be diff --git a/releasenotes/notes/docker-bump-dc4e85668ee69a21.yaml b/releasenotes/notes/docker-bump-dc4e85668ee69a21.yaml index 3563d6d3a..d5c6c3e21 100644 --- a/releasenotes/notes/docker-bump-dc4e85668ee69a21.yaml +++ b/releasenotes/notes/docker-bump-dc4e85668ee69a21.yaml @@ -8,4 +8,4 @@ fixes: - | Separated out repos for Docker CE for Ubuntu Jammy/Focal. This fixes a Pulp sync issue where two "identical" repository versions existed with different - checksums. + checksums. diff --git a/releasenotes/notes/feature-smartmon-65cacfe893f0eb47.yaml b/releasenotes/notes/feature-smartmon-65cacfe893f0eb47.yaml index 94dc25978..23b9e5bc8 100644 --- a/releasenotes/notes/feature-smartmon-65cacfe893f0eb47.yaml +++ b/releasenotes/notes/feature-smartmon-65cacfe893f0eb47.yaml @@ -4,5 +4,5 @@ features: Adds drive temperatures to the table on the hardware overview dashboard and a timeseries to show the temperature over time. - | - Adds picker to hardware overview dashboard to select a specific host to + Adds picker to hardware overview dashboard to select a specific host to show drive information for. diff --git a/releasenotes/notes/fix-cephadm-facts-2ee6dc9a1c617944.yaml b/releasenotes/notes/fix-cephadm-facts-2ee6dc9a1c617944.yaml index 98f0e1779..bb0071fae 100644 --- a/releasenotes/notes/fix-cephadm-facts-2ee6dc9a1c617944.yaml +++ b/releasenotes/notes/fix-cephadm-facts-2ee6dc9a1c617944.yaml @@ -3,4 +3,4 @@ fixes: - | The Ceph version is now determined by ``os_release``, rather than Ansible facts. Using Ansible facts caused playbooks to fail when - facts are not gathered. + facts are not gathered. diff --git a/releasenotes/notes/kolla-bump-cve-2024-36039-07f18e18b5c86980.yaml b/releasenotes/notes/kolla-bump-cve-2024-36039-07f18e18b5c86980.yaml index 1877ebc62..bfddbb74d 100644 --- a/releasenotes/notes/kolla-bump-cve-2024-36039-07f18e18b5c86980.yaml +++ b/releasenotes/notes/kolla-bump-cve-2024-36039-07f18e18b5c86980.yaml @@ -3,5 +3,5 @@ security: - | Addresses critical vulnerability CVE-2024-36039 by bumping the PyMySQL library to 1.1.1 in all affected - Kolla images. This vulnerability allows SQL injection + Kolla images. This vulnerability allows SQL injection through untrusted JSON objects. diff --git a/releasenotes/notes/ubuntu-jammy-cd109d12954d7626.yaml b/releasenotes/notes/ubuntu-jammy-cd109d12954d7626.yaml index 2219bf37f..4265655c1 100644 --- a/releasenotes/notes/ubuntu-jammy-cd109d12954d7626.yaml +++ b/releasenotes/notes/ubuntu-jammy-cd109d12954d7626.yaml @@ -1,7 +1,7 @@ --- upgrade: - | - Dont pull apt packages from pulp for Ubuntu Jammy until Jammy packages + Dont pull apt packages from pulp for Ubuntu Jammy until Jammy packages are published. - | Dont pull ceph packages from ceph official repos for Ubuntu Jammy until diff --git a/releasenotes/notes/update-kayobe-automation-55fc9c5c380d819c.yaml b/releasenotes/notes/update-kayobe-automation-55fc9c5c380d819c.yaml index f8e2e32a3..f8dee5b4d 100644 --- a/releasenotes/notes/update-kayobe-automation-55fc9c5c380d819c.yaml +++ b/releasenotes/notes/update-kayobe-automation-55fc9c5c380d819c.yaml @@ -2,7 +2,7 @@ features: - | Upgrades kayobe-automation submodule to ``7676aa8``. - + Upgrades kayobe-workflows collection to ``v1.1.0``. Kayobe-automation config-diff now runs in parallel and generates both diff --git a/tools/rabbitmq-queue-migration.sh b/tools/rabbitmq-queue-migration.sh index 089b197eb..d0f802341 100755 --- a/tools/rabbitmq-queue-migration.sh +++ b/tools/rabbitmq-queue-migration.sh @@ -65,7 +65,7 @@ if [[ ! "$1" = "--skip-checks" ]]; then sleep 60 # Assert that all queues are durable if ! ( kayobe overcloud host command run -l controllers -b --command "docker exec $RABBITMQ_CONTAINER_NAME rabbitmqctl list_queues durable --silent | grep false" > /dev/null 2>&1 ); then - echo -e "${GREEN}Queues migrated successfully" + echo -e "${GREEN}Queues migrated successfully" else echo -e "${RED}Failed post-check: A controller has non-durable queues" fi