From a953ca4d8615c72281bb2309f9e33cbfd794e08a Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Thu, 25 Apr 2024 10:49:11 +0100 Subject: [PATCH] Switch default Ceph deployment to the Reef release The only configuration tested in CI with packages from download.ceph.com on Ubuntu 22.04. Change-Id: Ieb4df1ef92ba8117c384124d626ab335fc62a59d --- inventory/group_vars/all/ceph.yml | 6 +++--- .../caracal_ceph_versions-540b63041e61ae86.yaml | 8 ++++++++ .../bootstrap-host/tasks/prepare_aio_config.yml | 12 +++++++----- 3 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 releasenotes/notes/caracal_ceph_versions-540b63041e61ae86.yaml diff --git a/inventory/group_vars/all/ceph.yml b/inventory/group_vars/all/ceph.yml index 02600bedcb..22b4417b83 100644 --- a/inventory/group_vars/all/ceph.yml +++ b/inventory/group_vars/all/ceph.yml @@ -22,13 +22,13 @@ osd_group_name: ceph-osd rgw_group_name: ceph-rgw mds_group_name: ceph-mds nfs_group_name: ceph-nfs -ceph_origin: "{{ (ansible_facts['distribution'] | lower == 'ubuntu' and ansible_facts['distribution_version'] | lower == '22.04') | ternary('distro', 'repository') }}" -ceph_pkg_source: "{{ (ansible_facts['distribution'] | lower == 'ubuntu' and ansible_facts['distribution_version'] | lower == '22.04') | ternary('distro', 'ceph') }}" +ceph_origin: repository +ceph_pkg_source: ceph ceph_repository: community # The _stable_release var is used by both the OSA ceph_client role and the # ceph-ansible roles. It is defaulted in ceph_client but set here to keep the # OSA/ceph-ansible integrations in sync. -ceph_stable_release: quincy +ceph_stable_release: reef fetch_directory: "{{ openstack_config_dir }}/ceph-fetch/" # tries to create /var/log/ceph as a directory and fails if the log link already # exists. we handle the log dir creation so this is not something we need diff --git a/releasenotes/notes/caracal_ceph_versions-540b63041e61ae86.yaml b/releasenotes/notes/caracal_ceph_versions-540b63041e61ae86.yaml new file mode 100644 index 0000000000..bbd5d576ac --- /dev/null +++ b/releasenotes/notes/caracal_ceph_versions-540b63041e61ae86.yaml @@ -0,0 +1,8 @@ +--- +features: + - | + The default Ceph release deployed in the openstack-ansible + all-in-one is switched from the Quicny to Reef. It remains + that this integration is primarily a test fixture and that the + recommendation for production deployments is to deploy an independant + ceph cluster. diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml index 874edd6bb5..9fbed3eca2 100644 --- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml +++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml @@ -84,12 +84,14 @@ nova_virt_type: 'qemu' # NOTE(jrosser) # we only run ceph jobs on ubuntu in CI so this is sufficient - ceph_stable_repo: "http://{{ nodepool_vars.NODEPOOL_MIRROR_HOST }}/ceph-deb-quincy" + # NOTE(jrosser) + # re-enable these local CI repos when the reef release is mirrored + #ceph_stable_repo: "http://{{ nodepool_vars.NODEPOOL_MIRROR_HOST }}/ceph-deb-reef" # we must set the ceph repo seperatley for the ceph_client role - ceph_apt_repos: - ceph: - state: "present" - repo: "deb http://{{ nodepool_vars.NODEPOOL_MIRROR_HOST }}/ceph-deb-quincy {{ ansible_facts['distribution_release'] }} main" + #ceph_apt_repos: + # ceph: + # state: "present" + # repo: "deb http://{{ nodepool_vars.NODEPOOL_MIRROR_HOST }}/ceph-deb-reef {{ ansible_facts['distribution_release'] }} main" copy: dest: /etc/openstack_deploy/user_openstackci.yml content: "{{ nodepool_overrides | to_nice_yaml }}"