From 9157656d496eb595d2b13f10a0ce069034f97fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Fri, 15 Jan 2016 19:10:47 +0100 Subject: [PATCH] Clarify ceph_origin usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Han --- group_vars/all.sample | 5 ++++- roles/ceph-common/defaults/main.yml | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/group_vars/all.sample b/group_vars/all.sample index ecf62ec24..d8ea86424 100644 --- a/group_vars/all.sample +++ b/group_vars/all.sample @@ -37,6 +37,9 @@ dummy: ## Configure package origin # #ceph_origin: 'upstream' # or 'distro' +# 'distro' means that no separate repo file will be added +# you will get whatever version of Ceph is included in your Linux distro. +# #ceph_use_distro_backports: false # DEBIAN ONLY # STABLE @@ -57,7 +60,7 @@ dummy: # - firefly # - giant # - hammer -# +# # 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 diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index a560fb235..6591fdc12 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -35,6 +35,9 @@ redhat_package_dependencies: ## Configure package origin # ceph_origin: 'upstream' # or 'distro' +# 'distro' means that no separate repo file will be added +# you will get whatever version of Ceph is included in your Linux distro. +# ceph_use_distro_backports: false # DEBIAN ONLY