From: Sébastien Han <sebastien.han@enovance.com>
Date: Mon, 5 Jan 2015 23:18:04 +0000 (+0100)
Subject: Remove the fsid vars from mon and osd roles
X-Git-Tag: v1.0.0~287^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=216c8e24c83a865a49798a7383fdda7e53b331cf;p=ceph-ansible.git

Remove the fsid vars from mon and osd roles

We do not need them since they get registered by the ceph-common role.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
---

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index c0c2c1132..996aa7b99 100644
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -1,8 +1,7 @@
 ---
 # You can override vars by using host or group vars
 
-# ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT
-fsid: "{{ cluster_uuid.stdout }}"
+# ACTIVATE MONITOR_SECRET VARIABLE FOR NON-VAGRANT DEPLOYMENT
 # monitor_secret:
 cephx: true
 
diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index 06b93129a..b05b21e9f 100644
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -4,9 +4,6 @@
 
 ## Ceph options
 #
-
-# ACTIVATE THE FSID VARIABLE FOR NON-VAGRANT DEPLOYMENT
-fsid: "{{ cluster_uuid.stdout }}"
 cephx: true
 
 # Devices to be used as OSDs