From 532b81d6eebe1b8c43b3f22e7983181a31333779 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 25 Jul 2022 08:11:38 +0200 Subject: [PATCH] cephadm: Use distro-provided Quincy on Jammy Ubuntu Jammy will only support Ceph Quincy. Workaround for now - use Jammy in-distro packages for cephadm. Change-Id: I30f071865b9b0751f1336414a0ae82571a332530 --- roles/cephadm/defaults/main.yml | 1 + roles/cephadm/tasks/pkg_debian.yml | 1 + zuul.d/jobs.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/roles/cephadm/defaults/main.yml b/roles/cephadm/defaults/main.yml index ccbfb4a5d6..af91b60acd 100644 --- a/roles/cephadm/defaults/main.yml +++ b/roles/cephadm/defaults/main.yml @@ -1,6 +1,7 @@ --- cephadm_ceph_release: "pacific" cephadm_ceph_apt_repo: "deb http://download.ceph.com/debian-{{ cephadm_ceph_release }}/ {{ ansible_distribution_release }} main" +cephadm_use_package_from_distribution: false cephadm_ceph_rpm_repos: - shortname: "ceph" diff --git a/roles/cephadm/tasks/pkg_debian.yml b/roles/cephadm/tasks/pkg_debian.yml index d888752130..eed23b7998 100644 --- a/roles/cephadm/tasks/pkg_debian.yml +++ b/roles/cephadm/tasks/pkg_debian.yml @@ -11,3 +11,4 @@ repo: "{{ cephadm_ceph_apt_repo }}" filename: ceph become: True + when: not cephadm_use_package_from_distribution | bool diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 32b8a900ee..7b3ba1bcbc 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -93,6 +93,7 @@ timeout: 9000 vars: base_distro: ubuntu + cephadm_use_package_from_distribution: true - job: name: kolla-ansible-centos8s-source-mariadb