Add noble configs to Caracal

Author: seunghun1ee

etc/kayobe/ansible/ubuntu-upgrade.yml

@@ -1,22 +1,22 @@
 ---
 # To prevent Ansible role dependency errors, this playbook requires that environment variable
 # ANSIBLE_ROLES_PATH is defined and includes '$KAYOBE_PATH/ansible/roles' on the Ansible control host.
-- name: Migrate hosts from Ubuntu Focal 20.04 to Jammy 22.04
+- name: Migrate hosts from Ubuntu Jammy 22.04 to Noble 24.04
   hosts: overcloud:infra-vms:seed:seed-hypervisor
   vars:
     ansible_python_interpreter: /usr/bin/python3
     reboot_timeout_s: "{{ 20 * 60 }}"
   tasks:
-    - name: Assert that hosts are running Ubuntu Focal
+    - name: Assert that hosts are running Ubuntu Jammy
       ansible.builtin.assert:
         that:
           - ansible_facts.distribution == 'Ubuntu'
-          - ansible_facts.distribution_major_version == '20'
-          - ansible_facts.distribution_release == 'focal'
+          - ansible_facts.distribution_major_version == '22'
+          - ansible_facts.distribution_release == 'jammy'
           - os_distribution == 'ubuntu'
         fail_msg: >-
-          This playbook is only designed for Ubuntu Focal 20.04 hosts. Ensure
-          that you are limiting it to only run on Focal hosts and
+          This playbook is only designed for Ubuntu Jammy 22.04 hosts. Ensure
+          that you are limiting it to only run on Jammy hosts and
           os_distribution is set to ubuntu.
 
     - name: Ensure apt packages are up to date
@@ -53,14 +53,14 @@
       when: file_status.stat.exists
 
     # NOTE: We cannot use apt_repository here because definitions must exist within the standard repos.list
-    - name: Ensure Jammy repo definitions exist in sources.list
+    - name: Ensure Noble repo definitions exist in sources.list
       ansible.builtin.blockinfile:
         path: /etc/apt/sources.list
         block: |
-          deb {{ stackhpc_repo_ubuntu_jammy_url }} jammy main restricted universe multiverse
-          deb {{ stackhpc_repo_ubuntu_jammy_url }} jammy-updates main restricted universe multiverse
-          deb {{ stackhpc_repo_ubuntu_jammy_url }} jammy-backports main restricted universe multiverse
-          deb {{ stackhpc_repo_ubuntu_jammy_security_url }} jammy-security main restricted universe multiverse
+          deb {{ stackhpc_repo_ubuntu_noble_url }} noble main restricted universe multiverse
+          deb {{ stackhpc_repo_ubuntu_noble_url }} noble-updates main restricted universe multiverse
+          deb {{ stackhpc_repo_ubuntu_noble_url }} noble-backports main restricted universe multiverse
+          deb {{ stackhpc_repo_ubuntu_noble_security_url }} noble-security main restricted universe multiverse
       become: true
 
     - name: Do release upgrade
@@ -87,13 +87,13 @@
 - name: Run the Kayobe network configuration playbook, to ensure definitions are not lost on reboot
   import_playbook: "{{ lookup('ansible.builtin.env', 'VIRTUAL_ENV') }}/share/kayobe/ansible/network.yml"
 
-- name: Reboot and confirm the host is upgraded to Jammy 22.04
+- name: Reboot and confirm the host is upgraded to Noble 24.04
   hosts: overcloud:infra-vms:seed:seed-hypervisor
   vars:
     ansible_python_interpreter: /usr/bin/python3
     reboot_timeout_s: "{{ 20 * 60 }}"
   tasks:
-    - name: Ensure Jammy repo definitions do not exist in sources.list
+    - name: Ensure Noble repo definitions do not exist in sources.list
       ansible.builtin.blockinfile:
         path: /etc/apt/sources.list
         state: absent
@@ -126,8 +126,8 @@
         filter: "{{ kayobe_ansible_setup_filter }}"
         gather_subset: "{{ kayobe_ansible_setup_gather_subset }}"
 
-    - name: Assert that hosts are now using Ubuntu 22
+    - name: Assert that hosts are now using Ubuntu 24
       ansible.builtin.assert:
         that:
-          - ansible_facts.distribution_major_version == '22'
-          - ansible_facts.distribution_release == 'jammy'
+          - ansible_facts.distribution_major_version == '24'
+          - ansible_facts.distribution_release == 'noble'

etc/kayobe/apt.yml

@@ -78,6 +78,22 @@ stackhpc_apt_repositories:
     signed_by: ceph.asc
     architecture: amd64
     required: true
+  - url: "{{ stackhpc_repo_ubuntu_noble_url }}"
+    suites: "{{ ansible_facts.distribution_release }} {{ ansible_facts.distribution_release }}-updates {{ ansible_facts.distribution_release }}-backports"
+    components: main restricted universe multiverse
+    architecture: amd64
+    required: true
+  - url: "{{ stackhpc_repo_ubuntu_noble_security_url }}"
+    suites: "{{ ansible_facts.distribution_release }}-security"
+    components: main restricted universe multiverse
+    architecture: amd64
+    required: true
+  - url: "{{ stackhpc_repo_docker_ce_ubuntu_noble_url }}"
+    suites: "{{ ansible_facts.distribution_release  }}"
+    components: stable
+    signed_by: docker.asc
+    architecture: amd64
+    required: true
 
 # Do not replace apt configuration for non-overcloud hosts. This can result in
 # errors if apt reconfiguration is performed before local repository mirrors

etc/kayobe/cephadm.yml

@@ -3,7 +3,7 @@
 # Cephadm deployment configuration.
 
 # Ceph release name.
-cephadm_ceph_release: "reef"
+cephadm_ceph_release: "{{ 'squid' if (ansible_facts['distribution_release'] == 'noble') else 'reef' }}"
 
 # Ceph FSID.
 #cephadm_fsid:
@@ -12,10 +12,10 @@ cephadm_ceph_release: "reef"
 cephadm_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/ceph:{{ cephadm_image_tag }}"
 
 # Ceph container image tag.
-cephadm_image_tag: "v18.2.4"
+cephadm_image_tag: "{{ 'v19.2.1' if os_release == 'noble' else 'v18.2.4' }}"
 
-# Ceph custom repo workaround for Ubuntu Jammy as there are no official ceph repos for jammy.
-cephadm_custom_repos: "{{ ansible_facts['distribution_release'] == 'jammy' }}"
+# Ceph custom repo workaround for Ubuntu as there are no official ceph repos for Ubuntu jammy and noble.
+cephadm_custom_repos: "{{ ansible_facts['ansible_distribution'] == 'Ubuntu' }}"
 
 # HAProxy container image.
 cephadm_haproxy_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/haproxy:{{ cephadm_haproxy_image_tag }}"

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

@@ -9,7 +9,7 @@
 os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
 
 # OS release. Valid options are "9" when os_distribution is "rocky", or
-# "jammy" when os_distribution is "ubuntu".
+# "jammy" and "noble" when os_distribution is "ubuntu".
 os_release: >-
           {{ (lookup('pipe', '. /etc/os-release && echo $VERSION_CODENAME') | trim) if os_distribution == 'ubuntu' else
              (lookup('pipe', '. /etc/os-release && echo $VERSION_ID') | trim | split('.') | first) if os_distribution == 'rocky' }}

etc/kayobe/environments/aufn-ceph/kolla/config/bifrost/bifrost.yml

@@ -6,8 +6,10 @@ download_ipa: true
 
 # Use a locally hosted cloud image.
 use_cirros: true
-{% if os_distribution == 'ubuntu' %}
+{% if os_distribution == 'ubuntu' and os_release == 'jammy' %}
 cirros_deploy_image_upstream_url: "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
+{% elif os_distribution == 'ubuntu' and os_release == 'noble' %}
+cirros_deploy_image_upstream_url: "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
 {% else %}
 cirros_deploy_image_upstream_url: "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
 {% endif %}

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

@@ -50,7 +50,7 @@
 os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
 
 # OS release. Valid options are "9" when os_distribution is "rocky", or
-# "jammy" when os_distribution is "ubuntu".
+# "jammy" and "noble" when os_distribution is "ubuntu".
 os_release: >-
           {{ (lookup('pipe', '. /etc/os-release && echo $VERSION_CODENAME') | trim) if os_distribution == 'ubuntu' else
              (lookup('pipe', '. /etc/os-release && echo $VERSION_ID') | trim | split('.') | first) if os_distribution == 'rocky' }}

etc/kayobe/environments/ci-aio/inventory/group_vars/cis-hardening/cis

@@ -14,3 +14,10 @@ rhel9cis_rule_5_4_3_2: false
 ubtu22cis_rule_5_4_3_2: false
 
 ##############################################################################
+# Ubuntu Noble CIS Hardening Configuration
+
+# Disable shell timeout for inactivity which can be disruptive to
+# development work.
+ubtu24cis_rule_5_4_3_2: false
+
+##############################################################################

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

@@ -30,6 +30,9 @@ stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy
 stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version }}"
+stackhpc_repo_ubuntu_noble_version: "{{ stackhpc_pulp_repo_ubuntu_noble_version }}"
+stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble_security_version }}"
+stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
 stackhpc_repo_ceph_reef_debian_version: "{{ stackhpc_pulp_repo_ceph_reef_debian_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
 stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"

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

@@ -56,6 +56,9 @@ stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy
 stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version }}"
+stackhpc_repo_ubuntu_noble_version: "{{ stackhpc_pulp_repo_ubuntu_noble_version }}"
+stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble_security_version }}"
+stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
 stackhpc_repo_ceph_reef_debian_version: "{{ stackhpc_pulp_repo_ceph_reef_debian_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
 stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"

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

@@ -50,7 +50,7 @@
 os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
 
 # OS release. Valid options are "9" when os_distribution is "rocky", or
-# "jammy" when os_distribution is "ubuntu".
+# "jammy" and "noble" when os_distribution is "ubuntu".
 os_release: >-
           {{ (lookup('pipe', '. /etc/os-release && echo $VERSION_CODENAME') | trim) if os_distribution == 'ubuntu' else
              (lookup('pipe', '. /etc/os-release && echo $VERSION_ID') | trim | split('.') | first) if os_distribution == 'rocky' }}