From: Sébastien Han <seb@redhat.com>
Date: Mon, 2 Jan 2017 08:20:43 +0000 (+0100)
Subject: common: document "cluster" variable usage
X-Git-Tag: v2.2.0rc1~75^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b76d0aceca71cb3e5fe1cb63420170aa1d76cbd5;p=ceph-ansible.git

common: document "cluster" variable usage

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1408848

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

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index c46a20a0a..31c0b7c73 100644
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -14,7 +14,17 @@ dummy:
 ###########
 
 #fetch_directory: fetch/
-#cluster: ceph # cluster name
+
+# The 'cluster' variable determines the name of the cluster.
+# Changing the default value to something else means that you will
+# need to change all the command line calls as well, for example if
+# your cluster name is 'foo':
+# "ceph health" will become "ceph --cluster foo health"
+#
+# An easier way to handle this is to use the environment variable CEPH_ARGS
+# So run: "export CEPH_ARGS="--cluster foo"
+# With that you will be able to run "ceph health" normally
+#cluster: ceph
 
 ###########
 # INSTALL #
diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index b9970b8c6..13ad0b39c 100644
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -6,7 +6,17 @@
 ###########
 
 fetch_directory: fetch/
-cluster: ceph # cluster name
+
+# The 'cluster' variable determines the name of the cluster.
+# Changing the default value to something else means that you will
+# need to change all the command line calls as well, for example if
+# your cluster name is 'foo':
+# "ceph health" will become "ceph --cluster foo health"
+#
+# An easier way to handle this is to use the environment variable CEPH_ARGS
+# So run: "export CEPH_ARGS="--cluster foo"
+# With that you will be able to run "ceph health" normally
+cluster: ceph
 
 ###########
 # INSTALL #