From 99e401b7c91c2ae52a30f52452ee08297a9a9003 Mon Sep 17 00:00:00 2001 From: leseb Date: Fri, 3 Jul 2015 16:26:21 +0200 Subject: [PATCH] Add more repo source for stable Attempt to fix #305 Signed-off-by: leseb --- group_vars/all | 5 +++++ roles/ceph-common/defaults/main.yml | 5 +++++ roles/ceph-common/tasks/install_on_debian.yml | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/group_vars/all b/group_vars/all index 308b9ddd9..f0f0d060a 100644 --- a/group_vars/all +++ b/group_vars/all @@ -24,6 +24,11 @@ dummy: #ceph_stable_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc #ceph_stable_release: hammer # ceph stable release +# Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions +# # for a list of available Debian distributions, visit http://ceph.com/debian-{{ ceph_stable_release }}/dists/ +# for more info read: https://github.com/ceph/ceph-ansible/issues/305 +#ceph_stable_distro_source: + # This option is needed for _both_ stable and dev version, so please always fill the right version # # for supported distros, see http://ceph.com/rpm-{{ ceph_stable_release }}/ #ceph_stable_redhat_distro: el7 diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index b21538768..6422f9f0a 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -21,6 +21,11 @@ ceph_stable: true # use ceph stable branch ceph_stable_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc ceph_stable_release: hammer # ceph stable release +# Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions +# # for a list of available Debian distributions, visit http://ceph.com/debian-{{ ceph_stable_release }}/dists/ +# for more info read: https://github.com/ceph/ceph-ansible/issues/305 +#ceph_stable_distro_source: + # This option is needed for _both_ stable and dev version, so please always fill the right version # # for supported distros, see http://ceph.com/rpm-{{ ceph_stable_release }}/ ceph_stable_redhat_distro: el7 diff --git a/roles/ceph-common/tasks/install_on_debian.yml b/roles/ceph-common/tasks/install_on_debian.yml index e72fba2ad..6cb648028 100644 --- a/roles/ceph-common/tasks/install_on_debian.yml +++ b/roles/ceph-common/tasks/install_on_debian.yml @@ -30,7 +30,7 @@ - name: add Ceph stable repository apt_repository: > - repo="deb http://ceph.com/debian-{{ ceph_stable_release }}/ {{ ansible_lsb.codename }} main" + repo="deb http://ceph.com/debian-{{ ceph_stable_release }}/ {{ ceph_stable_distro_source | default(ansible_lsb.codename) }} main" state=present changed_when: false when: ceph_stable