diff --git a/.github/workflows/stackhpc-build-kayobe-image.yml b/.github/workflows/stackhpc-build-kayobe-image.yml index b535dc03e..8581603b7 100644 --- a/.github/workflows/stackhpc-build-kayobe-image.yml +++ b/.github/workflows/stackhpc-build-kayobe-image.yml @@ -120,3 +120,4 @@ jobs: RESULTS_URL: "N/A" WORKFLOW_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" if: failure() && github.event_name == 'push' + diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml index ea2cfdcec..ae0122b71 100644 --- a/.github/workflows/stackhpc-container-image-build.yml +++ b/.github/workflows/stackhpc-container-image-build.yml @@ -149,7 +149,7 @@ jobs: - name: Install Docker Python SDK run: | sudo pip install docker - + - name: Get Kolla tag id: write-kolla-tag run: echo "kolla-tag=${{ needs.generate-tag.outputs.openstack_release }}-${{ matrix.distro }}-${{ matrix.distro == 'rocky' && '9' || 'jammy' }}-${{ needs.generate-tag.outputs.datetime_tag }}" >> $GITHUB_OUTPUT diff --git a/doc/source/operations/secret-rotation.rst b/doc/source/operations/secret-rotation.rst index 5761fd4d6..e03f27c60 100644 --- a/doc/source/operations/secret-rotation.rst +++ b/doc/source/operations/secret-rotation.rst @@ -74,7 +74,7 @@ Full method the state of the cloud before any changes are made 2. Edit your Kolla-Ansible checkout to include changes not yet included - upstream. + upstream. .. _kolla-change: @@ -98,7 +98,7 @@ Full method .. code:: bash git fetch https://review.opendev.org/openstack/kolla-ansible refs/changes/78/903178/2 && git cherry-pick FETCH_HEAD - + 3. Re-install Kolla-Ansible from source in your Kolla-Ansible Python environment @@ -129,7 +129,7 @@ Full method ^redis_master_password ^memcache_secret_key _ssh_key - + private_key public_key ^$ 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 4edcd01a4..e149a7de9 100755 --- a/etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh +++ b/etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh @@ -59,7 +59,7 @@ if [[ ! -d kayobe ]]; then virtualenv kayobe fi # NOTE: Virtualenv's activate and deactivate scripts reference an -# unbound variable. +# unbound variable. set +u source kayobe/bin/activate set -u @@ -135,7 +135,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 2129bc122..f795051d6 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-dnf-repos b/etc/kayobe/inventory/group_vars/overcloud/stackhpc-dnf-repos index c4f70a863..82c26bad2 100644 --- a/etc/kayobe/inventory/group_vars/overcloud/stackhpc-dnf-repos +++ b/etc/kayobe/inventory/group_vars/overcloud/stackhpc-dnf-repos @@ -1,5 +1,5 @@ # 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 dnf_custom_repos: "{{ stackhpc_dnf_repos }}" diff --git a/etc/kayobe/inventory/group_vars/wazuh-manager/wazuh-manager b/etc/kayobe/inventory/group_vars/wazuh-manager/wazuh-manager index 2fb16b23d..7dea41243 100644 --- a/etc/kayobe/inventory/group_vars/wazuh-manager/wazuh-manager +++ b/etc/kayobe/inventory/group_vars/wazuh-manager/wazuh-manager @@ -31,7 +31,7 @@ indexer_node_name: "{{ inventory_hostname }}" indexer_network_host: "{{ provision_oc_net_name | net_ip }}" # Even in a single node setup this must be defined. If not defaults to 127.0.0.1 -indexer_cluster_nodes: +indexer_cluster_nodes: - "{{ indexer_network_host }}" instances: diff --git a/etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.yml.example b/etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.yml.example index 435d63c09..2ae65a206 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/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/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