Fix linter issues

Alex-Welsh · Alex-Welsh · commit 901ca385833e · 2025-08-01T16:02:21.000+01:00
diff --git a/.github/workflows/stackhpc-all-in-one.yml b/.github/workflows/stackhpc-all-in-one.yml
@@ -271,7 +271,7 @@ jobs:
             -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
             -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
             ${{ steps.kayobe_image.outputs.kayobe_image }} \
-            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible/fixes/fix-hostname.yml
+            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible${{ inputs.upgrade && '/' || '/fixes/' }}fix-hostname.yml
         env:
           KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
 
@@ -282,7 +282,7 @@ jobs:
             -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
             -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
             ${{ steps.kayobe_image.outputs.kayobe_image }} \
-            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible/maintenance/reboot.yml -e reboot_with_bootstrap_user=true
+            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible${{ inputs.upgrade && '/' || '/maintenance/' }}reboot.yml -e reboot_with_bootstrap_user=true
         env:
           KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
 
@@ -292,7 +292,7 @@ jobs:
             -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
             -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
             ${{ steps.kayobe_image.outputs.kayobe_image }} \
-            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/tools/growroot.yml'
+            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible${{ inputs.upgrade && '/' || '/tools/' }}growroot.yml'
         env:
           KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
 
@@ -322,7 +322,7 @@ jobs:
             -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
             -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
             ${{ steps.kayobe_image.outputs.kayobe_image }} \
-            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible/tools/configure-aio-resources.yml
+            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible${{ inputs.upgrade && '/' || '/tools/' }}configure-aio-resources.yml
         env:
           KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
 
diff --git a/.github/workflows/stackhpc-pull-request.yml b/.github/workflows/stackhpc-pull-request.yml
@@ -100,6 +100,8 @@ jobs:
       - name: Linting code 🧪
         run: |
           ansible-lint -v --force-color etc/kayobe/ansible/.
+        env:
+          KAYOBE_CONFIG_PATH: ${{ github.workspace }}/etc/kayobe/
 
   # A skipped job is treated as success when used as a required status check.
   # The registered required status checks refer to the name of the job in the
diff --git a/doc/source/configuration/wazuh.rst b/doc/source/configuration/wazuh.rst
@@ -252,7 +252,7 @@ vault file which will be placed in ``$KAYOBE_CONFIG_PATH/deployment/wazuh-secret
 If using environments it ends up in ``$KAYOBE_CONFIG_PATH/environments/<env_name>/deployment/wazuh-secrets.yml``
 Remember to encrypt!
 
-Wazuh secrets template is located in ``$KAYOBE_CONFIG_PATH/ansible/templates/deployment/wazuh-secrets.yml.j2``.
+Wazuh secrets template is located in ``$KAYOBE_CONFIG_PATH/ansible/templates/wazuh-secrets.yml.j2``.
 It will be used by wazuh secrets playbook to generate wazuh secrets vault file.
 
 
diff --git a/etc/kayobe/ansible/deployment/deploy-os-capacity-exporter.yml b/etc/kayobe/ansible/deployment/deploy-os-capacity-exporter.yml
@@ -48,7 +48,7 @@
 
         - name: Template clouds.yml
           ansible.builtin.template:
-            src: templates/os_capacity-clouds.yml.j2
+            src: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/ansible/templates/os_capacity-clouds.yml.j2"
             dest: /opt/kayobe/os-capacity/clouds.yaml
           register: clouds_yaml_result
 
diff --git a/etc/kayobe/ansible/deployment/smartmon-tools.yml b/etc/kayobe/ansible/deployment/smartmon-tools.yml
@@ -56,7 +56,7 @@
 
     - name: Copy smartmon.py and nvmemon.sh from scripts folder
       ansible.builtin.copy:
-        src: scripts/{{ item }}
+        src: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/ansible/scripts/{{ item }}"
         dest: /usr/local/bin/{{ item }}
         owner: root
         group: root
diff --git a/etc/kayobe/ansible/deployment/wazuh-secrets.yml b/etc/kayobe/ansible/deployment/wazuh-secrets.yml
@@ -19,7 +19,7 @@
     - name: Template new secrets
       no_log: true
       ansible.builtin.template:
-        src: wazuh-secrets.yml.j2
+        src: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/ansible/templates/wazuh-secrets.yml.j2"
         dest: "{{ wazuh_secrets_path }}"
 
     - name: In-place encrypt wazuh-secrets
diff --git a/etc/kayobe/ansible/deployment/write-github-workflows.yml b/etc/kayobe/ansible/deployment/write-github-workflows.yml
@@ -2,6 +2,6 @@
 - name: Write Kayobe Automation Workflows for GitHub
   hosts: github-writer
   vars:
-    github_output_directory: "{{ kayobe_config_path }}/../../.github/workflows"
+    github_output_directory: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/../../.github/workflows"
   roles:
     - stackhpc.kayobe_workflows.github
diff --git a/etc/kayobe/ansible/deployment/write-gitlab-pipelines.yml b/etc/kayobe/ansible/deployment/write-gitlab-pipelines.yml
@@ -2,6 +2,6 @@
 - name: Write Kayobe Automation Pipeline for GitLab
   hosts: gitlab-writer
   vars:
-    gitlab_output_directory: "{{ kayobe_config_path }}/../../"
+    gitlab_output_directory: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/../../"
   roles:
     - stackhpc.kayobe_workflows.gitlab
diff --git a/etc/kayobe/ansible/fixes/fix-hostname.yml b/etc/kayobe/ansible/fixes/fix-hostname.yml
@@ -23,7 +23,7 @@
       become: true
 
 - name: Reboot hosts
-  import_playbook: "{{ playbook_dir | realpath }}/maintenance/reboot.yml"
+  import_playbook: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/ansible/maintenance/reboot.yml"
   vars:
     reboot_hosts: fix-hostname
     reboot_with_bootstrap_user: true
diff --git a/etc/kayobe/ansible/fixes/fix-houston.yml b/etc/kayobe/ansible/fixes/fix-houston.yml
@@ -23,7 +23,7 @@
 
     - name: Create systemd service for -ovs network interface
       ansible.builtin.template:
-        src: fix-houston-interface.service.j2
+        src: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/ansible/templates/fix-houston-interface.service.j2"
         dest: /etc/systemd/system/fix-houston-{{ item }}.service
       loop: "{{ neutron_bridge_name.split(',') }}"
       vars:
diff --git a/etc/kayobe/ansible/maintenance/octavia-amphora-image-register.yml b/etc/kayobe/ansible/maintenance/octavia-amphora-image-register.yml
@@ -12,7 +12,7 @@
         lookup('env', 'OS_PROJECT_NAME') != 'service'
 
 - name: Download Amphora image from Ark
-  ansible.builtin.import_playbook: pulp-amphora-image-download.yml
+  ansible.builtin.import_playbook: ../pulp/pulp-amphora-image-download.yml
   when: download_amphora_from_ark | bool
 
 - name: Register an Octavia Amphora image in Glance
diff --git a/etc/kayobe/ansible/pulp/roles/pulp_auth_proxy/README.md b/etc/kayobe/ansible/pulp/roles/pulp_auth_proxy/README.md
diff --git a/etc/kayobe/ansible/pulp/roles/pulp_auth_proxy/defaults/main.yml b/etc/kayobe/ansible/pulp/roles/pulp_auth_proxy/defaults/main.yml
diff --git a/etc/kayobe/ansible/pulp/roles/pulp_auth_proxy/tasks/main.yml b/etc/kayobe/ansible/pulp/roles/pulp_auth_proxy/tasks/main.yml
diff --git a/etc/kayobe/ansible/pulp/roles/pulp_auth_proxy/templates/pulp_proxy.conf.j2 b/etc/kayobe/ansible/pulp/roles/pulp_auth_proxy/templates/pulp_proxy.conf.j2
diff --git a/etc/kayobe/ansible/tools/check-kayobe-version.yml b/etc/kayobe/ansible/tools/check-kayobe-version.yml
@@ -4,7 +4,7 @@
   hosts: localhost
   gather_facts: false
   vars:
-    requirements_path: "{{ kayobe_config_path }}/../../requirements.txt"
+    requirements_path: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/../../requirements.txt"
   tasks:
     - name: Check version
       when: stackhpc_enable_kayobe_check
diff --git a/etc/kayobe/ansible/tools/check-kolla-images-py.yml b/etc/kayobe/ansible/tools/check-kolla-images-py.yml
@@ -18,14 +18,14 @@
     - name: Check image mapping
       ansible.builtin.command:
         cmd: >-
-          {{ kayobe_config_path }}/../../tools/kolla-images.py
+          {{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/../../tools/kolla-images.py
           check-image-map
           --kolla-ansible-path {{ tempdir_result.path }}
 
     - name: Check tag hierarchy
       ansible.builtin.command:
         cmd: >-
-          {{ kayobe_config_path }}/../../tools/kolla-images.py
+          {{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/../../tools/kolla-images.py
           check-hierarchy
           --kolla-ansible-path {{ tempdir_result.path }}
 
diff --git a/etc/kayobe/ansible/tools/check-tags.yml b/etc/kayobe/ansible/tools/check-tags.yml
@@ -9,7 +9,7 @@
     - name: Query images and tags
       ansible.builtin.command:
         cmd: >-
-          {{ kayobe_config_path }}/../../tools/kolla-images.py list-tags
+          {{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/../../tools/kolla-images.py list-tags
       register: kolla_images_result
       changed_when: false
 
diff --git a/etc/kayobe/ansible/tools/configure-aio-resources.yml b/etc/kayobe/ansible/tools/configure-aio-resources.yml
@@ -39,7 +39,7 @@
 
     - name: Run init-run-once
       ansible.builtin.script:
-        cmd: scripts/aio-init.sh
+        cmd: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/ansible/scripts/aio-init.sh"
         creates: /tmp/.init-runonce
       environment:
         KOLLA_OPENSTACK_COMMAND: "{{ venv }}/bin/openstack"
diff --git a/etc/kayobe/ansible/tools/diagnostics.yml b/etc/kayobe/ansible/tools/diagnostics.yml
@@ -25,13 +25,13 @@
             dest: "{{ diagnostics_tmpdir.path }}/facts.json"
 
         - name: Run diagnostics script
-          ansible.builtin.script: "{{ kayobe_config_path }}/../../tools/diagnostics.sh"
+          ansible.builtin.script: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/../../tools/diagnostics.sh"
           become: true
           failed_when: diagnostics_result.rc is not defined
           register: diagnostics_result
           environment:
             LOG_DIR: "{{ diagnostics_tmpdir.path }}"
-            CONFIG_DIR: "{{ kayobe_config_path }}/../.."
+            CONFIG_DIR: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/../.."
 
         - name: Download diagnostic logs to localhost
           ansible.posix.synchronize:
diff --git a/tools/get-new-playbook-path.sh b/tools/get-new-playbook-path.sh
@@ -48,7 +48,6 @@ SECRET_STORE_PLAYBOOKS=(
     "secret-store-unseal-seed.yml"
 )
 
-
 FIXES_PLAYBOOKS=(
     "fix-grub-rl9.yml"
     "fix-hostname.yml"
