Revert "Remove the fsid vars from mon and osd roles"

This reverts commit 216c8e24c83a865a49798a7383fdda7e53b331cf.

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 996aa7b990ebe40129630c0a062327a521f6b079..c0c2c1132523640e0d9c2948bfdeb7130da13d99 100644 (file)
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -1,7 +1,8 @@
 ---\r
 # You can override vars by using host or group vars\r
 \r
-# ACTIVATE MONITOR_SECRET VARIABLE FOR NON-VAGRANT DEPLOYMENT\r
+# ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT\r
+fsid: "{{ cluster_uuid.stdout }}"\r
 # monitor_secret:\r
 cephx: true\r
 \r

diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index b05b21e9f09ddf4c29a8a22d795b346a177e3822..06b93129a8bcbd3bc618da38ea1649ed594b71a2 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -4,6 +4,9 @@
 \r
 ## Ceph options\r
 #\r
+\r
+# ACTIVATE THE FSID VARIABLE FOR NON-VAGRANT DEPLOYMENT\r
+fsid: "{{ cluster_uuid.stdout }}"\r
 cephx: true\r
 \r
 # Devices to be used as OSDs\r