Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion roles/cephadm/tasks/pkg_debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
apt_repository:
repo: "deb [signed-by={{ cephadm_apt_key_path }}] https://download.ceph.com/debian-{{ item }}/ {{ cephadm_apt_repo_dist }} main"
state: "{{ 'present' if item == cephadm_ceph_release else 'absent' }}"
when: not cephadm_custom_repos | bool
# there are not yet official repos for Ubuntu 22.04 so we use canonical repo
# see https://docs.ceph.com/en/latest/cephadm/install/#cephadm-install-distros
when: not cephadm_custom_repos | bool and item != "quincy"
become: true
loop: "{{ cephadm_ceph_releases }}"

Expand Down
1 change: 1 addition & 0 deletions roles/cephadm/templates/cluster.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ spec:
{{ service.spec | to_nice_yaml }}
{% endif %}
{% endfor %}
{% endif %}
{% if groups.get('ingress', []) | length > 0 %}
{% for service in cephadm_ingress_services %}
---
Expand Down