Add more repo source for stable

Attempt to fix #305

Signed-off-by: leseb <seb@redhat.com>

diff --git a/group_vars/all b/group_vars/all
index 308b9ddd935a0cc3f85383f40456be07554a4887..f0f0d060a25707f42ca78a059ee6b442518695ed 100644 (file)
--- 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 b215387687ddd50ae2e21a737249e64e633d67fd..6422f9f0ae571b33005dfa6f5638c104bfe07711 100644 (file)
--- 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\r
 ceph_stable_release: hammer # ceph stable release\r
 \r
+# Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions\r
+# # for a list of available Debian distributions, visit http://ceph.com/debian-{{ ceph_stable_release }}/dists/\r
+# for more info read: https://github.com/ceph/ceph-ansible/issues/305\r
+#ceph_stable_distro_source:\r
+\r
 # This option is needed for _both_ stable and dev version, so please always fill the right version\r
 # # for supported distros, see http://ceph.com/rpm-{{ ceph_stable_release }}/\r
 ceph_stable_redhat_distro: el7\r

diff --git a/roles/ceph-common/tasks/install_on_debian.yml b/roles/ceph-common/tasks/install_on_debian.yml
index e72fba2adfb12469c1dedcb990cab7eb1ed0705d..6cb648028f770360ddf773052c0145baf54c14b5 100644 (file)
--- 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