Skip to content

Commit fd0179a

Browse files
authored
Merge pull request #78 from jheikki100/master
Debian template fix and repository workaround
2 parents e5fd8c8 + c0fc605 commit fd0179a

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

roles/cephadm/tasks/pkg_debian.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
apt_repository:
3131
repo: "deb [signed-by={{ cephadm_apt_key_path }}] https://download.ceph.com/debian-{{ item }}/ {{ cephadm_apt_repo_dist }} main"
3232
state: "{{ 'present' if item == cephadm_ceph_release else 'absent' }}"
33-
when: not cephadm_custom_repos | bool
33+
# there are not yet official repos for Ubuntu 22.04 so we use canonical repo
34+
# see https://docs.ceph.com/en/latest/cephadm/install/#cephadm-install-distros
35+
when: not cephadm_custom_repos | bool and item != "quincy"
3436
become: true
3537
loop: "{{ cephadm_ceph_releases }}"
3638

roles/cephadm/templates/cluster.yml.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ spec:
5454
{{ service.spec | to_nice_yaml }}
5555
{% endif %}
5656
{% endfor %}
57+
{% endif %}
5758
{% if groups.get('ingress', []) | length > 0 %}
5859
{% for service in cephadm_ingress_services %}
5960
---

0 commit comments

Comments
 (0)