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>

diff --git a/Vagrantfile b/Vagrantfile
index 93aa06ec83cdff07c95e3046ba7058dffb9f789c..8d2db6c3f967d8e7a377fc4041bb30a78fdca5ae 100644 (file)
--- 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 f0f0d060a25707f42ca78a059ee6b442518695ed..8f9a32a722d55d7e11cdd36c875696744cc1f5c3 100644 (file)
--- 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 690b1d0072a80870015c6a49d553018fb0faa831..86f71f59046bc657f9a8d77ac465d1189079e5a4 100644 (file)
--- a/group_vars/mons
+++ b/group_vars/mons
@@ -11,7 +11,7 @@ dummy:
 \r
 # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT\r
 #fsid: "{{ cluster_uuid.stdout }}"\r
-# monitor_secret:\r
+#monitor_secret:\r
 #cephx: true\r
 \r
 # CephFS\r

diff --git a/group_vars/osds b/group_vars/osds
index 8f593f5da4fa1386e53c4190de8755b9975fec78..640c9e86a1b209aa93dd2885942f233bdb08f7ac 100644 (file)
--- 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 6422f9f0ae571b33005dfa6f5638c104bfe07711..789bea29f97959d4e54b4c660f52b77abcd1aee3 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -17,7 +17,7 @@ restapi_group_name: restapis
 ########\r
 \r
 # COMMUNITY VERSION\r
-ceph_stable: true # use ceph stable branch\r
+ceph_stable: false # use ceph stable branch\r
 ceph_stable_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc\r
 ceph_stable_release: hammer # ceph stable release\r
 \r
@@ -54,7 +54,7 @@ ceph_stable_ice: false # use Inktank Ceph Enterprise
 # on RHEL 7.\r
 #\r
 ceph_stable_rh_storage: false\r
-ceph_stable_rh_storage_cdn_install: true # assumes all the nodes can connect to cdn.redhat.com\r
+ceph_stable_rh_storage_cdn_install: false # assumes all the nodes can connect to cdn.redhat.com\r
 ceph_stable_rh_storage_iso_install: false # usually used when nodes don't have access to cdn.redhat.com\r
 #ceph_stable_rh_storage_iso_path:\r
 ceph_stable_rh_storage_mount_path: /tmp/rh-storage-mount\r

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 9d0b7b3c7a0145a400814e9535702777943bff06..57e45f1873430f303e4fd2d7f19d2e36831b7a96 100644 (file)
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -9,7 +9,7 @@ rgw_group_name: rgws
 \r
 # ACTIVATE BOTH FSID AND MONITOR_SECRET VARIABLES FOR NON-VAGRANT DEPLOYMENT\r
 fsid: "{{ cluster_uuid.stdout }}"\r
-# monitor_secret:\r
+#monitor_secret:\r
 cephx: true\r
 \r
 # CephFS\r

diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index 8754f6661d15a30e3f6cc7a360502a82c44742e6..368f3c3224c6d0e418f1162bfb55245a13b59de9 100644 (file)
--- 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\r
 # creating a partition at the beginning of the device\r
 \r
-journal_collocation: true\r
+journal_collocation: false\r
 \r
 \r
 # II. Second scenario: single journal device for N OSDs\r