From 50d1f73afe881d9057822b56282320c72dfd867a Mon Sep 17 00:00:00 2001
From: leseb <seb@redhat.com>
Date: Fri, 3 Jul 2015 18:38:30 +0200
Subject: [PATCH] Change default options

We want to force the user to only enable the options they need. Thus
they shouldn't have to enable one option and then disable another.

Signed-off-by: leseb <seb@redhat.com>
---
 Vagrantfile                         | 2 ++
 group_vars/all                      | 4 ++--
 group_vars/mons                     | 2 +-
 group_vars/osds                     | 2 +-
 roles/ceph-common/defaults/main.yml | 4 ++--
 roles/ceph-mon/defaults/main.yml    | 2 +-
 roles/ceph-osd/defaults/main.yml    | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 93aa06ec8..8d2db6c3f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -32,6 +32,8 @@ ansible_provision = proc do |ansible|
 
   # In a production deployment, these should be secret
   ansible.extra_vars = {
+    ceph_stable: 'true',
+    journal_collocation: 'true',
     fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45',
     monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==',
     journal_size: 100,
diff --git a/group_vars/all b/group_vars/all
index f0f0d060a..8f9a32a72 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -20,7 +20,7 @@ dummy:
 ########
 
 # COMMUNITY VERSION
-#ceph_stable: true # use ceph stable branch
+#ceph_stable: false # use ceph stable branch
 #ceph_stable_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
 #ceph_stable_release: hammer # ceph stable release
 
@@ -57,7 +57,7 @@ dummy:
 # on RHEL 7.
 #
 #ceph_stable_rh_storage: false
-#ceph_stable_rh_storage_cdn_install: true # assumes all the nodes can connect to cdn.redhat.com
+#ceph_stable_rh_storage_cdn_install: false # assumes all the nodes can connect to cdn.redhat.com
 #ceph_stable_rh_storage_iso_install: false # usually used when nodes don't have access to cdn.redhat.com
 #ceph_stable_rh_storage_iso_path:
 #ceph_stable_rh_storage_mount_path: /tmp/rh-storage-mount
diff --git a/group_vars/mons b/group_vars/mons
index 690b1d007..86f71f590 100644
--- a/group_vars/mons
+++ b/group_vars/mons
@@ -11,7 +11,7 @@ dummy:
 
 # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT
 #fsid: "{{ cluster_uuid.stdout }}"
-# monitor_secret:
+#monitor_secret:
 #cephx: true
 
 # CephFS
diff --git a/group_vars/osds b/group_vars/osds
index 8f593f5da..640c9e86a 100644
--- a/group_vars/osds
+++ b/group_vars/osds
@@ -69,7 +69,7 @@ osd_crush_location: "'root={{ ceph_crush_root }} rack={{ ceph_crush_rack }} host
 # This will collocate both journal and data on the same disk
 # creating a partition at the beginning of the device
 
-#journal_collocation: true
+#journal_collocation: false
 
 
 # II. Second scenario: single journal device for N OSDs
diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 6422f9f0a..789bea29f 100644
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -17,7 +17,7 @@ restapi_group_name: restapis
 ########
 
 # COMMUNITY VERSION
-ceph_stable: true # use ceph stable branch
+ceph_stable: false # use ceph stable branch
 ceph_stable_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
 ceph_stable_release: hammer # ceph stable release
 
@@ -54,7 +54,7 @@ ceph_stable_ice: false # use Inktank Ceph Enterprise
 # on RHEL 7.
 #
 ceph_stable_rh_storage: false
-ceph_stable_rh_storage_cdn_install: true # assumes all the nodes can connect to cdn.redhat.com
+ceph_stable_rh_storage_cdn_install: false # assumes all the nodes can connect to cdn.redhat.com
 ceph_stable_rh_storage_iso_install: false # usually used when nodes don't have access to cdn.redhat.com
 #ceph_stable_rh_storage_iso_path:
 ceph_stable_rh_storage_mount_path: /tmp/rh-storage-mount
diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 9d0b7b3c7..57e45f187 100644
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -9,7 +9,7 @@ rgw_group_name: rgws
 
 # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT
 fsid: "{{ cluster_uuid.stdout }}"
-# monitor_secret:
+#monitor_secret:
 cephx: true
 
 # CephFS
diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index 8754f6661..368f3c322 100644
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -66,7 +66,7 @@ osd_auto_discovery: false
 # This will collocate both journal and data on the same disk
 # creating a partition at the beginning of the device
 
-journal_collocation: true
+journal_collocation: false
 
 
 # II. Second scenario: single journal device for N OSDs