Synchronise master with upstream

ansible/compute-libvirt-host.yml

@@ -15,7 +15,7 @@
         state: present
       when:
         - compute_libvirt_enabled | bool
-        - ansible_facts.distribution in ['CentOS', 'Rocky']
+        - ansible_facts.distribution == 'Rocky'
         - compute_libvirt_ceph_repo_install | bool
       become: true
 

ansible/inventory/group_vars/all/compute

@@ -3,9 +3,8 @@
 # Compute node configuration.
 
 # User with which to access the compute nodes via SSH during bootstrap, in
-# order to setup the Kayobe user account. Default is 'cloud-user' if
-# os_distribution is set to centos, otherwise {{ os_distribution }}.
-compute_bootstrap_user: "{{ 'cloud-user' if os_distribution == 'centos' else os_distribution }}"
+# order to setup the Kayobe user account. Default is {{ os_distribution }}.
+compute_bootstrap_user: "{{ os_distribution }}"
 
 ###############################################################################
 # Compute network interface configuration.
@@ -255,11 +254,11 @@ compute_libvirt_sasl_password:
 # Whether to enable a libvirt TLS listener. Default is false.
 compute_libvirt_enable_tls: false
 
-# Whether to install a Ceph package repository on CentOS and Rocky hosts.
+# Whether to install a Ceph package repository on Rocky Linux hosts.
 # Default is true.
 compute_libvirt_ceph_repo_install: true
 
-# Ceph package repository release to install on CentOS and Rocky hosts when
+# Ceph package repository release to install on Rocky Linux hosts when
 # compute_libvirt_ceph_repo_install is true. Default is 'squid'.
 compute_libvirt_ceph_repo_release: squid
 

ansible/inventory/group_vars/all/controllers

@@ -3,9 +3,8 @@
 # Controller node configuration.
 
 # User with which to access the controllers via SSH during bootstrap, in order
-# to setup the Kayobe user account. Default is 'cloud-user' if os_distribution
-# is set to centos, otherwise {{ os_distribution }}.
-controller_bootstrap_user: "{{ 'cloud-user' if os_distribution == 'centos' else os_distribution }}"
+# to setup the Kayobe user account. Default is {{ os_distribution }}.
+controller_bootstrap_user: "{{ os_distribution }}"
 
 ###############################################################################
 # Controller groups.

ansible/inventory/group_vars/all/dnf

@@ -12,12 +12,6 @@ dnf_config: {}
 # Whether or not to use a local DNF mirror. Default value is 'false'.
 dnf_use_local_mirror: false
 
-# Mirror FQDN for DNF CentOS repos. Default value is 'mirror.stream.centos.org'.
-dnf_centos_mirror_host: 'mirror.stream.centos.org'
-
-# Mirror directory for DNF CentOS repos. Default value is ''.
-dnf_centos_mirror_directory: ''
-
 # Mirror FQDN for DNF Rocky repos. Default value is 'dl.rockylinux.org'.
 dnf_rocky_mirror_host: 'dl.rockylinux.org'
 

ansible/inventory/group_vars/all/globals

@@ -51,27 +51,24 @@ kayobe_ansible_user: "stack"
 ###############################################################################
 # OS distribution.
 
-# OS distribution name. Valid options are "centos", "rocky", "ubuntu". Default
-# is "rocky".
+# OS distribution name. Valid options are "rocky" and "ubuntu". Default is
+# "rocky".
 os_distribution: "rocky"
 
-# Mapping from OS distribution name to OS family. Supported keys are
-# "centos", "rocky", and "ubuntu".
+# Mapping from OS distribution name to OS family. Supported keys are "rocky"
+# and "ubuntu".
 os_family_map:
-  centos: RedHat
   rocky: RedHat
   ubuntu: Debian
 
 # OS family. Valid options are "RedHat" and "Debian". Default depends on
 # os_distribution.
 os_family: "{{ os_family_map[os_distribution | lower] }}"
 
-# OS release. Valid options are "10-stream" when os_distribution is "centos",
-# "10" when os_distribution is "rocky", or "noble" when os_distribution is
-# "ubuntu".
+# OS release. Valid options are "10" when os_distribution is "rocky", or
+# "noble" when os_distribution is "ubuntu".
 os_release: >-
-  {{ '10-stream' if os_distribution == 'centos'
-  else '10' if os_distribution == 'rocky'
+  {{ '10' if os_distribution == 'rocky'
   else 'noble' }}
 
 ###############################################################################

ansible/inventory/group_vars/all/infra-vms

@@ -42,18 +42,14 @@ infra_vm_root_format: qcow2
 
 # Base image for the infra VM root volume. Default is
 # "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
-# when os_distribution is "ubuntu",
+# when os_distribution is "ubuntu", or
 # "https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2"
-# when os_distribution is "rocky", or
-# "https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-10-latest.x86_64.qcow2"
 # otherwise.
 infra_vm_root_image: >-
   {%- if os_distribution == 'ubuntu' %}
   https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
-  {%- elif os_distribution == 'rocky' %}
-  https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2
   {%- else -%}
-  https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-10-latest.x86_64.qcow2
+  https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2
   {%- endif %}
 
 # Capacity of the infra VM data volume.
@@ -73,7 +69,7 @@ infra_vm_hypervisor: "{{ groups['seed-hypervisor'] | first }}"
 infra_vm_wait_connection_ssh_extra_args: '-o StrictHostKeyChecking=no'
 
 # OS family. Needed for config drive generation.
-infra_vm_os_family: "{{ 'RedHat' if os_distribution in ['centos', 'rocky'] else 'Debian' }}"
+infra_vm_os_family: "{{ 'RedHat' if os_distribution == 'rocky' else 'Debian' }}"
 
 # Boot firmware. Possible values are 'bios' or 'efi'. Default is 'efi'.
 infra_vm_boot_firmware: "efi"
@@ -85,9 +81,8 @@ infra_vm_machine:
 # Infrastructure VM node configuration.
 
 # User with which to access the infrastructure vm via SSH during bootstrap, in
-# order to setup the Kayobe user account. Default is 'cloud-user' if
-# os_distribution is set to centos, otherwise {{ os_distribution }}.
-infra_vm_bootstrap_user: "{{ 'cloud-user' if os_distribution == 'centos' else os_distribution }}"
+# order to setup the Kayobe user account. Default is {{ os_distribution }}.
+infra_vm_bootstrap_user: "{{ os_distribution }}"
 
 ###############################################################################
 # Infrastructure VM network interface configuration.

ansible/inventory/group_vars/all/kolla

@@ -56,14 +56,13 @@ kolla_node_custom_config_path: "{{ kolla_config_path }}/config"
 # Default is "{{ ansible_facts.architecture }}"
 kolla_base_arch: "{{ ansible_facts.architecture }}"
 
-# Kolla base container image distribution. Options are "centos", "debian",
-# "rocky", "ubuntu". Default is {{ os_distribution }}.
+# Kolla base container image distribution. Options are "debian", "rocky",
+# "ubuntu". Default is {{ os_distribution }}.
 kolla_base_distro: "{{ os_distribution }}"
 
 # Kolla base container image distribution version default map.
 # Defines default versions for each distribution.
 kolla_base_distro_version_default_map: {
-  "centos": "stream10",
   "debian": "bookworm",
   "rocky": "10",
   "ubuntu": "noble",
@@ -696,4 +695,4 @@ kolla_no_proxy: "{{ no_proxy }}"
 
 ##############################################################################
 # Inspector configuration
-kolla_inspector_enable_discovery: "{{ inspector_enable_discovery | bool }}"
+kolla_inspector_enable_discovery: "{{ inspector_enable_discovery | bool }}"

ansible/inventory/group_vars/all/seed

@@ -3,9 +3,8 @@
 # Seed node configuration.
 
 # User with which to access the seed via SSH during bootstrap, in order to
-# setup the Kayobe user account. Default is 'cloud-user' if os_distribution is
-# set to centos, otherwise {{ os_distribution }}.
-seed_bootstrap_user: "{{ 'cloud-user' if os_distribution == 'centos' else os_distribution }}"
+# setup the Kayobe user account. Default is {{ os_distribution }}.
+seed_bootstrap_user: "{{ os_distribution }}"
 
 ###############################################################################
 # Seed network interface configuration.

ansible/inventory/group_vars/all/seed-hypervisor

@@ -3,9 +3,8 @@
 # Seed hypervisor node configuration.
 
 # User with which to access the seed hypervisor via SSH during bootstrap, in
-# order to setup the Kayobe user account. Default is 'cloud-user' if
-# os_distribution is set to centos, otherwise {{ os_distribution }}.
-seed_hypervisor_bootstrap_user: "{{ 'cloud-user' if os_distribution == 'centos' else os_distribution }}"
+# order to setup the Kayobe user account. Default is {{ os_distribution }}.
+seed_hypervisor_bootstrap_user: "{{ os_distribution }}"
 
 ###############################################################################
 # Seed hypervisor network interface configuration.

ansible/inventory/group_vars/all/seed-vm

@@ -42,18 +42,14 @@ seed_vm_root_format: qcow2
 
 # Base image for the seed VM root volume. Default is
 # "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
-# when os_distribution is "ubuntu",
+# when os_distribution is "ubuntu", or
 # "https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2"
-# when os_distribution is "rocky", or
-# "https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-10-latest.x86_64.qcow2"
 # otherwise.
 seed_vm_root_image: >-
   {%- if os_distribution == 'ubuntu' %}
   https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
-  {%- elif os_distribution == 'rocky' %}
-  https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2
   {%- else -%}
-  https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-10-latest.x86_64.qcow2
+  https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2
   {%- endif %}
 
 # Capacity of the seed VM data volume.

ansible/inventory/group_vars/all/storage

@@ -3,9 +3,8 @@
 # Storage node configuration.
 
 # User with which to access the storage nodes via SSH during bootstrap, in
-# order to setup the Kayobe user account. Default is 'cloud-user' if
-# os_distribution is set to centos, otherwise {{ os_distribution }}.
-storage_bootstrap_user: "{{ 'cloud-user' if os_distribution == 'centos' else os_distribution }}"
+# order to setup the Kayobe user account. Default is {{ os_distribution }}.
+storage_bootstrap_user: "{{ os_distribution }}"
 
 ###############################################################################
 # Storage network interface configuration.

ansible/roles/alliedware-plus-switch/tasks/main.yml

@@ -1,6 +1,7 @@
 ---
 - name: Ensure AlliedWare Plus switches are configured
   alliedtelesis.awplus.awplus_config:
+    diff_against: "running"
     lines: "{{ lookup('template', 'alliedware-plus-config.j2') }}"
     save_when: >-
       {{ alliedware_plus_switch_save | bool | ternary('modified', 'never') }}

ansible/roles/bootstrap/tasks/main.yml

@@ -16,7 +16,7 @@
     key: "{{ lookup('file', bootstrap_ssh_private_key_path ~ '.pub') }}"
 
 # NOTE(priteau): Exclude comments from ssh-keyscan output because they break
-# known_hosts on centos/rocky 10.
+# known_hosts on Rocky Linux 10.
 - name: Scan for SSH keys
   shell: ssh-keyscan {{ item }} | grep -v '^#'
   with_items:

ansible/roles/dnf/defaults/main.yml

@@ -7,12 +7,6 @@ dnf_config: {}
 # Whether or not to use a local DNF mirror.
 dnf_use_local_mirror: false
 
-# Mirror FQDN for DNF CentOS repos. Default value is 'mirror.stream.centos.org'.
-dnf_centos_mirror_host: 'mirror.stream.centos.org'
-
-# Mirror directory for DNF CentOS repos. Default value is ''.
-dnf_centos_mirror_directory: ''
-
 # Mirror FQDN for DNF Rocky repos. Default value is 'dl.rockylinux.org'.
 dnf_rocky_mirror_host: 'dl.rockylinux.org'
 

ansible/roles/dnf/tasks/local-mirror.yml

@@ -1,5 +1,5 @@
 ---
-- name: Copy Rocky/CentOS repo templates
+- name: Copy Rocky Linux repo templates
   vars:
     repo_file_prefix: "{{ ansible_facts.distribution | lower }}"
   template: