From: Sébastien Han <seb@redhat.com>
Date: Fri, 15 Jan 2016 18:10:47 +0000 (+0100)
Subject: Clarify ceph_origin usage
X-Git-Tag: v1.0.0~64^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F484%2Fhead;p=ceph-ansible.git

Clarify ceph_origin usage

Signed-off-by: Sébastien Han <seb@redhat.com>
---

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