Merge pull request #606 from stackhpc/zed-kolla-build

Zed kolla build config

Author: markgoddard

.automation

@@ -16,6 +16,10 @@ on:
       no_proxy:
         type: string
         required: false
+      base_image:
+        type: string
+        required: false
+        default: "rockylinux:9"
     outputs:
       kayobe_image:
         description: Reference of Kayobe image that was built
@@ -39,7 +43,7 @@ jobs:
       - name: Checkout kayobe config
         uses: actions/checkout@v3
         with:
-           submodules: true
+          submodules: true
 
       - name: Log in to the Container registry
         uses: docker/login-action@v2
@@ -76,6 +80,7 @@ jobs:
           build-args: |
              http_proxy=${{ inputs.http_proxy }}
              https_proxy=${{ inputs.https_proxy }}
+             BASE_IMAGE=${{ inputs.base_image }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/stackhpc-build-kayobe-image.yml

@@ -43,7 +43,7 @@ jobs:
     runs-on: [self-hosted, stackhpc-kayobe-config-kolla-builder]
     permissions: {}
     outputs:
-      kolla_tag: ${{ steps.kolla_tag.outputs.kolla_tag }}
+      datetime_tag: ${{ steps.datetime_tag.outputs.datetime_tag }}
       matrix: ${{ steps.set-matrix.outputs.matrix }}
       openstack_release: ${{ steps.openstack_release.outputs.openstack_release }}
     steps:
@@ -58,10 +58,10 @@ jobs:
 
       # Generate a tag to apply to all built container images.
       # Without this, each kayobe * container image build command would use a different tag.
-      - name: Generate container image tag
-        id: kolla_tag
+      - name: Generate container datetime tag
+        id: datetime_tag
         run: |
-          echo "kolla_tag=$(date +${{ steps.openstack_release.outputs.openstack_release }}-%Y%m%dT%H%M%S)" >> $GITHUB_OUTPUT
+          echo "datetime_tag=$(date +%Y%m%dT%H%M%S)" >> $GITHUB_OUTPUT
 
       # Dynamically define job matrix.
       # We need a separate matrix entry for each distribution, when the relevant input is true.
@@ -81,9 +81,9 @@ jobs:
           fi
           echo "]}" >> $GITHUB_OUTPUT
 
-      - name: Display container image tag
+      - name: Display container datetime tag
         run: |
-          echo "${{ steps.kolla_tag.outputs.kolla_tag }}"
+          echo "${{ steps.datetime_tag.outputs.datetime_tag }}"
 
   container-image-build:
     name: Build Kolla container images
@@ -162,7 +162,7 @@ jobs:
         run: |
           args="${{ github.event.inputs.regexes }}"
           args="$args -e kolla_base_distro=${{ matrix.distro }}"
-          args="$args -e kolla_tag=${{ needs.generate-tag.outputs.kolla_tag }}"
+          args="$args -e kolla_tag=$KOLLA_TAG"
           if ${{ inputs.push }} == 'true'; then
             args="$args --push"
           fi
@@ -171,12 +171,13 @@ jobs:
           kayobe overcloud container image build $args
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
+          KOLLA_TAG: "${{ needs.generate-tag.outputs.openstack_release }}-${{ matrix.distro }}-${{ matrix.distro == 'rocky' && '9' || 'jammy' }}-${{ needs.generate-tag.outputs.datetime_tag }}"
         if: github.event.inputs.overcloud == 'true'
 
       - name: Build and push kolla seed images
         run: |
           args="kolla_base_distro=${{ matrix.distro }}"
-          args="$args -e kolla_tag=${{ needs.generate-tag.outputs.kolla_tag }}"
+          args="$args -e kolla_tag=$KOLLA_TAG"
           if ${{ inputs.push }} == 'true'; then
             args="$args --push"
           fi
@@ -185,11 +186,12 @@ jobs:
           kayobe seed container image build $args
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
+          KOLLA_TAG: "${{ needs.generate-tag.outputs.openstack_release }}-${{ matrix.distro }}-${{ matrix.distro == 'rocky' && '9' || 'jammy' }}-${{ needs.generate-tag.outputs.datetime_tag }}"
         if: github.event.inputs.seed == 'true'
 
       - name: Get built container images
         run: |
-          sudo docker image ls --filter "reference=ark.stackhpc.com/stackhpc-dev/${{ matrix.distro }}-*:${{ needs.generate-tag.outputs.kolla_tag }}" > ${{ matrix.distro }}-container-images
+          sudo docker image ls --filter "reference=ark.stackhpc.com/stackhpc-dev/*:*${{ matrix.distro }}*${{ needs.generate-tag.outputs.datetime_tag }}" > ${{ matrix.distro }}-container-images
 
       - name: Upload container images artifact
         uses: actions/upload-artifact@v3

.github/workflows/stackhpc-container-image-build.yml

@@ -9,17 +9,17 @@ name: Pull request
   pull_request:
 jobs:
   tox:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     permissions: {}
     strategy:
       matrix:
         include:
           - environment: pep8
-            python-version: 3.8
+            python-version: "3.10"
           - environment: releasenotes
-            python-version: 3.8
+            python-version: "3.10"
           - environment: docs
-            python-version: 3.8
+            python-version: "3.10"
     name: Tox ${{ matrix.environment }} with Python ${{ matrix.python-version }}
     if: github.repository == 'stackhpc/stackhpc-kayobe-config'
     steps:

.github/workflows/stackhpc-pull-request.yml

@@ -1,6 +1,6 @@
 ---
 # Custom playbook to configure rsyslog to forward operating system logs to
-# fluentd, eventually reaching Kolla's Opensearch cluster.
+# fluentd, eventually reaching Kolla's OpenSearch cluster.
 #
 # Variables:
 # * rsyslog_group: Host pattern against which to target the playbook. Default

etc/kayobe/ansible/rsyslog.yml

@@ -12,5 +12,5 @@ glance_backend_ceph: "yes"
 cinder_backend_ceph: "yes"
 nova_backend_ceph: "yes"
 
-# Opensearch memory tuning
+# OpenSearch memory tuning
 opensearch_heap_size: 1g

etc/kayobe/environments/aufn-ceph/kolla/globals.yml

@@ -56,7 +56,7 @@ os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
 ###############################################################################
 
 # Avoid a reboot.
-selinux_do_reboot: false
+selinux_state: disabled
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

etc/kayobe/environments/ci-aio/globals.yml

@@ -9,7 +9,7 @@ nova_compute_virt_type: qemu
 openstack_service_workers: "1"
 openstack_service_rpc_workers: "1"
 
-# Elasticsearch memory tuning
+# OpenSearch memory tuning
 opensearch_heap_size: 1g
 
 # Increase Grafana timeout

etc/kayobe/environments/ci-aio/kolla/globals.yml

@@ -15,7 +15,7 @@ nova_backend_ceph: "yes"
 neutron_bridge_name: "{{ vxlan_interfaces[0].device }}-ovs"
 neutron_external_interface: "{{ vxlan_interfaces[0].device }}"
 
-# Opensearch memory tuning
+# OpenSearch memory tuning
 opensearch_heap_size: 1g
 
 # Octavia load balancer configuration

etc/kayobe/environments/ci-multinode/kolla/globals.yml

@@ -96,7 +96,7 @@ kolla_docker_registry_password: "{{ stackhpc_docker_registry_password }}"
 
 # Kolla OpenStack release version. This should be a Docker image tag.
 # Default is {{ openstack_release }}.
-kolla_openstack_release: "{% raw %}{{ kayobe_image_tags['openstack'][kolla_base_distro] }}{% endraw %}"
+# kolla_openstack_release:
 
 # Docker tag applied to built container images. Default is {{
 # kolla_openstack_release }}-{{ kolla_base_distro }}-{{
@@ -263,14 +263,6 @@ kolla_build_blocks:
         && grafana-cli plugins install grafana-piechart-panel
   ironic_inspector_header: |
     ADD additions-archive /
-  keystone_base_footer: |
-    {% raw %}
-    {% if base_package_type == 'deb' %}
-    RUN curl -sLO https://github.com/stackhpc/lasso/releases/download/applied%2F2.7.0-2build3/liblasso3_2.7.0-2build3_amd64.deb && \
-        sudo dpkg -i liblasso3_2.7.0-2build3_amd64.deb && \
-        rm -f liblasso3_2.7.0-2build3_amd64.deb
-    {% endif %}
-    {% endraw %}
   magnum_base_footer: |
     RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | head -n -1 | bash
 # Dict mapping image customization variable names to their values.
@@ -344,10 +336,9 @@ kolla_build_args:
   memcached_exporter_version: "0.9.0"
   mysqld_exporter_version: "0.13.0"
   node_exporter_version: "1.5.0"
+  node_exporter_sha256sum: "af999fd31ab54ed3a34b9f0b10c28e9acee9ef5ac5a5d5edfdde85437db7acbb"
   prometheus_version: "2.35.0"
   prometheus_alertmanager_version: "0.24.0"
-  prometheus_cadvisor_sha256sum: "8e3df91eee70c72ac3f3184b9fab1229b037c2e850ff1593103b2bd9028c57c0"
-  prometheus_cadvisor_version: "0.40.0"
 
 ###############################################################################
 # Kolla-ansible inventory configuration.

etc/kayobe/kolla.yml

@@ -6,63 +6,16 @@
 # non-overcloud hosts
 enable_docker_repo: "{% raw %}{{ 'overcloud' not in group_names or ansible_facts.os_family == 'Debian' }}{% endraw %}"
 
-magnum_tag: yoga-20230705T121023
-neutron_tag: yoga-20230515T150233
-nova_tag: yoga-20230718T112646
-octavia_tag: yoga-20230523T110936
-openvswitch_tag: yoga-20230515T150233
-ovn_tag: yoga-20230515T150233
-
 # kolla_base_distro must be set here to be resolvable on a per-host basis
 # This is necessary for os migrations where mixed clouds might be deployed
-kolla_base_distro: "{% raw %}{{ 'centos' if ansible_facts.distribution == 'Rocky' and ansible_facts.distribution_major_version == '8' else ansible_facts.distribution | lower }}{% endraw %}"
+kolla_base_distro: "{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}"
 
 kayobe_image_tags:
   openstack:
-    centos: yoga-20230217T135826
-    rocky: yoga-20230310T170929
-    ubuntu: yoga-20230220T181235
-  bifrost:
-    centos: yoga-20230217T160618
-    rocky: yoga-20230310T194732
-    ubuntu: yoga-20230220T184947
-  blazar:
-    centos: yoga-20230315T125157
-    rocky: yoga-20230315T130918
-    ubuntu: yoga-20230315T125441
-  caso:
-    centos: yoga-20230315T125157
-    rocky: yoga-20230315T130918
-    ubuntu: yoga-20230315T125441
-  grafana:
-    centos: yoga-20230419T085955
-    rocky: yoga-20230419T111514
-    ubuntu: yoga-20230426T084340
-  ironic:
-    centos: yoga-20230316T154655
-    rocky: yoga-20230316T170311
-    ubuntu: yoga-20230316T154704
-  ironic_dnsmasq:
-    centos: yoga-20230217T135826
-    rocky: yoga-20230310T170929
-    ubuntu: yoga-20230220T181235
-  opensearch:
-    centos: yoga-20230324T084510
-    rocky: yoga-20230622T154317
-    ubuntu: yoga-20230324T090345
-  prometheus_node_exporter:
-    centos: yoga-20230310T173747
-    rocky: yoga-20230315T170614
-    ubuntu: yoga-20230315T170541
+    rocky: zed-rocky-9-20230821T155947
+    ubuntu: zed-ubuntu-jammy-20230821T155947
 
-bifrost_tag: "{% raw %}{{ kayobe_image_tags['bifrost'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
-blazar_tag: "{% raw %}{{ kayobe_image_tags['blazar'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
-caso_tag: "{% raw %}{{ kayobe_image_tags['caso'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
-grafana_tag: "{% raw %}{{ kayobe_image_tags['grafana'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
-ironic_tag: "{% raw %}{{ kayobe_image_tags['ironic'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
-ironic_dnsmasq_tag: "{% raw %}{{ kayobe_image_tags['ironic_dnsmasq'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
-opensearch_tag: "{% raw %}{{ kayobe_image_tags['opensearch'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
-prometheus_node_exporter_tag: "{% raw %}{{ kayobe_image_tags['prometheus_node_exporter'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
+openstack_tag: "{% raw %}{{ kayobe_image_tags['openstack'][kolla_base_distro] }}{% endraw %}"
 
 om_enable_rabbitmq_high_availability: true
 

etc/kayobe/kolla/globals.yml

@@ -21,8 +21,8 @@ stackhpc_pulp_repo_rocky_9_2_baseos_version: 20230627T185020
 stackhpc_pulp_repo_rocky_9_2_crb_version: 20230627T185020
 stackhpc_pulp_repo_rocky_9_2_extras_version: 20230612T072506
 stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20230628T031859
-stackhpc_pulp_repo_ubuntu_jammy_version: 20230809T045713
-stackhpc_pulp_repo_ubuntu_jammy_security_version: 20230809T045713
+stackhpc_pulp_repo_ubuntu_jammy_version: 20230811T044829
+stackhpc_pulp_repo_ubuntu_jammy_security_version: 20230811T044829
 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20230809T091421
 stackhpc_pulp_repo_docker_ce_ubuntu_version: 20230809T012447
 stackhpc_pulp_repo_opensearch_2_x_version: 20230725T013015