diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2022-07-25 08:11:38 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2022-08-05 13:48:31 +0000 |
| commit | 532b81d6eebe1b8c43b3f22e7983181a31333779 (patch) | |
| tree | 71fa4cdceb96200e1e3ff80f272d03a1e737d27e | |
| parent | 332fdca50fd66c8a71dfe6c1294b4dc8ead031c8 (diff) | |
| download | kolla-ansible-532b81d6eebe1b8c43b3f22e7983181a31333779.tar.gz kolla-ansible-532b81d6eebe1b8c43b3f22e7983181a31333779.zip | |
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
| -rw-r--r-- | roles/cephadm/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/cephadm/tasks/pkg_debian.yml | 1 | ||||
| -rw-r--r-- | zuul.d/jobs.yaml | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/roles/cephadm/defaults/main.yml b/roles/cephadm/defaults/main.yml index ccbfb4a5d..af91b60ac 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 d88875213..eed23b799 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 32b8a900e..7b3ba1bcb 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 |