Merge pull request #1661 from stackhpc/zed-rebuild

Fix whitespace issues

Author: Alex-Welsh

.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'
+

.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

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
       ^$

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

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

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 %}

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 }}"

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:

etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.yml.example

@@ -16,15 +16,15 @@ route:
         - severity=~"critical|alert"
       receiver: 'slack-critical-notifications'
 
- 
+
 receivers:
   - name: 'slack-notifications'
     slack_configs:
     - channel: '#notifications'
       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:

releasenotes/notes/add-caso-f36b98453be10169.yaml

@@ -5,4 +5,4 @@
      that supports Cloud Accounting Usage Records. For more information, see
      the `upstream docs <https://caso.readthedocs.io/en/stable/>`__. Note that
      this container does not exist in upstream Kolla and is maintained
-     downstream by StackHPC. 
+     downstream by StackHPC.