Merge branch 'stackhpc/2024.1' into 2024.1-ansible-lint-alex

Author: Alex-Welsh

.github/auto-label.yaml

@@ -0,0 +1,26 @@
+---
+path:
+  pullrequest: true
+  paths:
+    doc: 'documentation'
+    .github: 'workflows'
+    terraform: 'workflows'
+    etc:
+      kayobe:
+        enviromnents:
+          ci-aio: 'workflows'
+          ci-builder: 'workflows'
+          ci-multinode: 'workflows'
+        trivy: 'workflows'
+        ansible: 'ansible'
+        kolla:
+          config:
+            grafana: "monitoring"
+            prometheus: "monitoring"
+            fluentd: "monitoring"
+
+staleness:
+  pullrequest: true
+
+requestsize:
+  enabled: true

.github/workflows/overcloud-host-image-build.yml

@@ -239,9 +239,11 @@ jobs:
           source venvs/kayobe/bin/activate &&
           source src/kayobe-config/kayobe-env --environment ci-builder &&
           kayobe playbook run \
-          src/kayobe-config/etc/kayobe/ansible/pulp-host-image-upload.yml \
-          -e image_path=/opt/kayobe/images/overcloud-rocky-9 \
-          -e host_image_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
+          src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
+          -e artifact_path=/opt/kayobe/images/overcloud-rocky-9 \
+          -e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
+          -e artifact_type="kayobe-images" \
+          -e file_regex="*.qcow2" \
           -e os_distribution="rocky" \
           -e os_release="9"
         env:
@@ -291,9 +293,11 @@ jobs:
           source venvs/kayobe/bin/activate &&
           source src/kayobe-config/kayobe-env --environment ci-builder &&
           kayobe playbook run \
-          src/kayobe-config/etc/kayobe/ansible/pulp-host-image-upload.yml \
-          -e image_path=/opt/kayobe/images/overcloud-ubuntu-jammy \
-          -e host_image_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
+          src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
+          -e artifact_path=/opt/kayobe/images/overcloud-ubuntu-jammy \
+          -e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
+          -e artifact_type="kayobe-images" \
+          -e file_regex="*.qcow2" \
           -e os_distribution="ubuntu" \
           -e os_release="jammy"
         env:

.github/workflows/overcloud-host-image-promote.yml

@@ -76,12 +76,12 @@ jobs:
           source venvs/kayobe/bin/activate &&
           source src/kayobe-config/kayobe-env --environment ci-builder &&
           kayobe playbook run \
-          src/kayobe-config/etc/kayobe/ansible/pulp-host-image-promote.yml \
-          -e image_path='/opt/kayobe/images/overcloud-rocky-linux-9' \
+          src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
+          -e artifact_type="kayobe-images" \
           -e os_distribution='rocky' \
           -e os_release='9'
         env:
-          OVERCLOUD_HOST_IMAGE_TAG: ${{ inputs.image_tag }}
+          ARTIFACT_TAG: ${{ inputs.image_tag }}
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
         if: inputs.rocky9
 
@@ -90,11 +90,11 @@ jobs:
           source venvs/kayobe/bin/activate &&
           source src/kayobe-config/kayobe-env --environment ci-builder &&
           kayobe playbook run \
-          src/kayobe-config/etc/kayobe/ansible/pulp-host-image-promote.yml \
-          -e image_path='/opt/kayobe/images/overcloud-ubuntu-jammy' \
+          src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
+          -e artifact_type="kayobe-images" \
           -e os_distribution='ubuntu' \
           -e os_release='jammy'
         env:
-          OVERCLOUD_HOST_IMAGE_TAG: ${{ inputs.image_tag }}
+          ARTIFACT_TAG: ${{ inputs.image_tag }}
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
         if: inputs.ubuntu-jammy

doc/source/operations/upgrading-openstack.rst

@@ -110,7 +110,7 @@ The ``neutron_dns_domain`` must end with a period ``.`` e.g. ``example.com.``.
 The domain set should be something that is not use anywhere else such as
 ``internal.compute.example.com.``
 
-The Neuron DNS integration can be disabled by setting
+The Neutron DNS integration can be disabled by setting
 ``neutron_dns_integration: false`` in ``kolla/globals.yml``
 
 Redis Default User

etc/kayobe/ansible/pulp-host-image-promote.yml renamed to etc/kayobe/ansible/pulp-artifact-promote.yml

@@ -1,30 +1,30 @@
 ---
-# Tag is the version of the image to promote, stored in an env variable named OVERCLOUD_HOST_IMAGE_TAG
-- name: Promote an image to production
+# Tag is the version of the artifact to promote, stored in an env variable named ARTIFACT_TAG
+- name: Promote an artifact to production
   hosts: localhost
   vars:
     remote_pulp_url: "{{ stackhpc_release_pulp_url }}"
-    remote_pulp_username: "{{ stackhpc_image_repository_username }}"
-    remote_pulp_password: "{{ stackhpc_image_repository_password }}"
-    repository_name: kayobe-images-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}
-    base_path: kayobe-images/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}
-    promotion_tag: "{{ lookup('env', 'OVERCLOUD_HOST_IMAGE_TAG') }}"
+    remote_pulp_username: "{{ stackhpc_release_pulp_username }}"
+    remote_pulp_password: "{{ stackhpc_release_pulp_password }}"
+    repository_name: "{{ artifact_type }}-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}"
+    pulp_base_path: "{{ artifact_type }}/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}"
+    promotion_tag: "{{ lookup('env', 'ARTIFACT_TAG') }}"
   tasks:
-    - name: Check whether the image exists
+    - name: Check whether the artifact exists
       pulp.squeezer.file_distribution:
         pulp_url: "{{ remote_pulp_url }}"
         username: "{{ remote_pulp_username }}"
         password: "{{ remote_pulp_password }}"
         name: "{{ repository_name }}_{{ promotion_tag }}"
-        base_path: "{{ base_path }}/{{ promotion_tag }}"
+        base_path: "{{ pulp_base_path }}/{{ promotion_tag }}"
       register: distribution_details
       until: distribution_details is success
       retries: 3
       delay: 5
 
-    - name: Fail if the image does not exist
+    - name: Fail if the artifact does not exist
       ansible.builtin.fail:
-        msg: Image {{ promotion_tag }} does not exist
+        msg: "artifact {{ promotion_tag }} does not exist"
       when: distribution_details.distribution is none
 
     - name: Ensure production content guard is set
@@ -33,7 +33,7 @@
         username: "{{ remote_pulp_username }}"
         password: "{{ remote_pulp_password }}"
         name: "{{ repository_name }}_{{ promotion_tag }}"
-        base_path: "{{ base_path }}/{{ promotion_tag }}"
+        base_path: "{{ pulp_base_path }}/{{ promotion_tag }}"
         content_guard: release
         state: present
       register: content_guard_result

etc/kayobe/ansible/pulp-host-image-upload.yml renamed to etc/kayobe/ansible/pulp-artifact-upload.yml

@@ -1,21 +1,21 @@
 ---
-- name: Upload and create a distribution for an image
+- name: Upload and create a distribution for an artifact
   hosts: seed
   vars:
     remote_pulp_url: "{{ stackhpc_release_pulp_url }}"
-    remote_pulp_username: "{{ stackhpc_image_repository_username }}"
-    remote_pulp_password: "{{ stackhpc_image_repository_password }}"
-    repository_name: kayobe-images-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}
-    pulp_base_path: kayobe-images/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}
+    remote_pulp_username: "{{ stackhpc_release_pulp_username }}"
+    remote_pulp_password: "{{ stackhpc_release_pulp_password }}"
+    repository_name: "{{ artifact_type }}-{{ openstack_release }}-{{ os_distribution }}-{{ os_release }}"
+    pulp_base_path: "{{ artifact_type }}/{{ openstack_release }}/{{ os_distribution }}/{{ os_release }}"
   tasks:
-    - name: Print image tag
+    - name: Print artifact tag
       ansible.builtin.debug:
-        msg: "Image tag: {{ host_image_tag }}"
+        msg: "artifact tag: {{ artifact_tag }}"
 
     - name: Get filename
       ansible.builtin.find:
-        paths: "{{ image_path }}"
-        patterns: "*.qcow2"
+        paths: "{{ artifact_path }}"
+        patterns: "{{ file_regex }}"
       register: found_files
 
     - name: Upload an artifact
@@ -109,8 +109,8 @@
         pulp_url: "{{ remote_pulp_url }}"
         username: "{{ remote_pulp_username }}"
         password: "{{ remote_pulp_password }}"
-        name: "{{ repository_name }}_{{ host_image_tag }}"
-        base_path: "{{ pulp_base_path }}/{{ host_image_tag }}"
+        name: "{{ repository_name }}_{{ artifact_tag }}"
+        base_path: "{{ pulp_base_path }}/{{ artifact_tag }}"
         publication: "{{ publication_details.publication.pulp_href }}"
         content_guard: development
         state: present
@@ -120,23 +120,23 @@
       retries: 3
       delay: 5
 
-    - name: Update new images file with versioned path
+    - name: Update new artifacts file with versioned path
       ansible.builtin.lineinfile:
-        path: /tmp/updated_images.txt
-        line: "{{ remote_pulp_url }}/pulp/content/{{ pulp_base_path }}/{{ host_image_tag }}/{{ found_files.files[0].path | basename }}"
+        path: /tmp/updated_artifacts.txt
+        line: "{{ remote_pulp_url }}/pulp/content/{{ pulp_base_path }}/{{ artifact_tag }}/{{ found_files.files[0].path | basename }}"
         create: true
       listen: Latest distribution details changed
 
-    - name: Update new images file with latest path
+    - name: Update new artifacts file with latest path
       ansible.builtin.lineinfile:
-        path: /tmp/updated_images.txt
+        path: /tmp/updated_artifacts.txt
         line: "{{ remote_pulp_url }}/pulp/content/{{ pulp_base_path }}/latest/{{ found_files.files[0].path | basename }}"
-      listen: Latest distribution details changed
+      when: latest_distribution_details.changed
 
     - name: Print versioned path
       ansible.builtin.debug:
-        msg: "New versioned path: {{ remote_pulp_url }}/pulp/content/{{ pulp_base_path }}/{{ host_image_tag }}/{{ found_files.files[0].path | basename }}"
-      listen: Latest distribution details changed
+        msg: "New versioned path: {{ remote_pulp_url }}/pulp/content/{{ pulp_base_path }}/{{ artifact_tag }}/{{ found_files.files[0].path | basename }}"
+      when: latest_distribution_details.changed
 
     - name: Print latest path
       ansible.builtin.debug:
@@ -145,5 +145,5 @@
 
     - name: Print version tag
       ansible.builtin.debug:
-        msg: "New tag: {{ host_image_tag }}"
-      listen: Latest distribution details changed
+        msg: "New tag: {{ artifact_tag }}"
+      when: latest_distribution_details.changed

etc/kayobe/ansible/pulp-host-image-download.yml

@@ -24,8 +24,8 @@
     - name: Download image artifact
       ansible.builtin.get_url:
         url: "{{ stackhpc_overcloud_host_image_url_no_auth }}"
-        username: "{{ stackhpc_image_repository_username }}"
-        password: "{{ stackhpc_image_repository_password }}"
+        username: "{{ stackhpc_release_pulp_username }}"
+        password: "{{ stackhpc_release_pulp_password }}"
         force_basic_auth: true
         unredirected_headers:
           - Authorization

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

@@ -94,5 +94,5 @@ stackhpc_docker_registry_password: !vault |
   3664
 
 # Username and password of the overcloud host image repository.
-stackhpc_image_repository_username: "{{ stackhpc_docker_registry_username }}"
-stackhpc_image_repository_password: "{{ stackhpc_docker_registry_password }}"
+stackhpc_release_pulp_username: "{{ stackhpc_docker_registry_username }}"
+stackhpc_release_pulp_password: "{{ stackhpc_docker_registry_password }}"

etc/kayobe/ipa.yml

@@ -119,10 +119,7 @@ ipa_build_dib_elements_extra:
 #ipa_collectors_default:
 
 # List of additional inspection collectors to run.
-ipa_collectors_extra:
-  - "dmi-decode"
-  - "extra-hardware"
-  - "numa-topology"
+ipa_collectors_extra: "{{ ['dmi-decode', 'extra-hardware', 'numa-topology'] if ipa_build_images else [] }}"
 
 # List of inspection collectors to run.
 #ipa_collectors:

etc/kayobe/kolla-image-tags.yml

@@ -9,21 +9,26 @@ kolla_image_tags:
   blazar:
     rocky-9: 2024.1-rocky-9-20241125T093138
     ubuntu-jammy: 2024.1-ubuntu-jammy-20241125T093138
+  cinder:
+    rocky-9: 2024.1-rocky-9-20241204T081836
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20241204T081836
   heat:
     rocky-9: 2024.1-rocky-9-20240805T142526
   nova:
     rocky-9: 2024.1-rocky-9-20241004T094540
     ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540
   neutron:
-    rocky-9: 2024.1-rocky-9-20241025T090323
-    ubuntu-jammy: 2024.1-ubuntu-jammy-20241025T090323
+    rocky-9: 2024.1-rocky-9-20241203T232519
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20241203T232519
   octavia:
     rocky-9: 2024.1-rocky-9-20241004T094540
     ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540
   horizon:
-    rocky-9: 2024.1-rocky-9-20240909T144917
-  bifrost_deploy:
-    rocky-9: 2024.1-rocky-9-20240725T165045
+    rocky-9: 2024.1-rocky-9-20241202T210927
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20241202T210927
+  bifrost:
+    rocky-9: 2024.1-rocky-9-20241128T162336
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20241128T162336
   prometheus:
     rocky-9: 2024.1-rocky-9-20240910T072617
   rabbitmq: