Remove trailing '/' from ceph_apt_repo_url
This little trailing '/' results in a duplicate entry for ceph packages if the repository has already been set up by ceph-ansible. This patch removes the entry with the trailing '/' (for convenience) and matches what ceph-ansible does. Change-Id: I445a3fcc5cec1234c2282eacf1e0704c5a0df11b
This commit is contained in:
parent
b0cde5f695
commit
0255bef843
|
@ -50,10 +50,13 @@
|
|||
# and the cache update as two separate tasks.
|
||||
- name: Add ceph repo(s)
|
||||
apt_repository:
|
||||
repo: "{{ ceph_apt_repos[ceph_pkg_source].repo }}"
|
||||
state: "{{ ceph_apt_repos[ceph_pkg_source].state }}"
|
||||
filename: "{{ ceph_apt_repos[ceph_pkg_source].filename | default(omit) }}"
|
||||
repo: "{{ ceph_apt_repos[item].repo }}"
|
||||
state: "{{ ceph_apt_repos[item].state }}"
|
||||
filename: "{{ ceph_apt_repos[item].filename | default(omit) }}"
|
||||
update_cache: no
|
||||
with_items:
|
||||
- remove_trailing_slash
|
||||
- "{{ ceph_pkg_source }}"
|
||||
register: add_repos
|
||||
|
||||
- name: Update Apt cache
|
||||
|
|
|
@ -32,7 +32,7 @@ ceph_revoked_gpg_keys:
|
|||
|
||||
# Ceph.com repository variables
|
||||
ceph_apt_repo_url_region: "download" # or "eu" for Netherlands based mirror
|
||||
ceph_apt_repo_url: "http://{{ ceph_apt_repo_url_region }}.ceph.com/debian-{{ ceph_stable_release }}/"
|
||||
ceph_apt_repo_url: "http://{{ ceph_apt_repo_url_region }}.ceph.com/debian-{{ ceph_stable_release }}"
|
||||
|
||||
# LibVirt differentials between Debian and Ubuntu
|
||||
libvirt_packages:
|
||||
|
@ -48,6 +48,9 @@ python_ceph_packages:
|
|||
|
||||
# Apt repositories
|
||||
ceph_apt_repos:
|
||||
ceph:
|
||||
repo: "deb {{ ceph_apt_repo_url }} {{ ansible_distribution_release }} main"
|
||||
state: "present"
|
||||
ceph:
|
||||
repo: "deb {{ ceph_apt_repo_url }} {{ ansible_distribution_release }} main"
|
||||
state: "present"
|
||||
remove_trailing_slash:
|
||||
repo: "deb {{ ceph_apt_repo_url }}/ {{ ansible_distribution_release }} main"
|
||||
state: "absent"
|
||||
|
|
Loading…
Reference in New Issue