openstack/kolla-ansible
Code Issues Proposed changes

Merge "cephadm: Use distro-provided Quincy on Jammy"

Browse Source
This commit is contained in:
Zuul 2022-08-05 16:35:47 +00:00 committed by Gerrit Code Review
commit e2d276cd96
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/cephadm/defaults/main.yml
View File

@ -1,6 +1,7 @@
--- ---
cephadm_ceph_release: "pacific" cephadm_ceph_release: "pacific"
cephadm_ceph_apt_repo: "deb http://download.ceph.com/debian-{{ cephadm_ceph_release }}/ {{ ansible_distribution_release }} main" 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: cephadm_ceph_rpm_repos:
- shortname: "ceph" - shortname: "ceph"

1
roles/cephadm/tasks/pkg_debian.yml
View File

@ -11,3 +11,4 @@
repo: "{{ cephadm_ceph_apt_repo }}" repo: "{{ cephadm_ceph_apt_repo }}"
filename: ceph filename: ceph
become: True become: True
when: not cephadm_use_package_from_distribution | bool

1
zuul.d/jobs.yaml
View File

@ -93,6 +93,7 @@
timeout: 9000 timeout: 9000
vars: vars:
base_distro: ubuntu base_distro: ubuntu
cephadm_use_package_from_distribution: true
- job: - job:
name: kolla-ansible-centos8s-source-mariadb name: kolla-ansible-centos8s-source-mariadb