Fix multiple things

* fix the Vagrantfile ruby check
* fix the variable positions

Bring more mandatory variables and try to separate Vagrant vars from the
playbook vars.

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

diff --git a/Vagrantfile b/Vagrantfile
index ff1277315428ab3dca428ed99d9466d297fb138e..9a6c7615dc5368b38fae8df6492c4d9e603e05c2 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -30,23 +30,35 @@ ansible_provision = proc do |ansible|
   }
 
   # In a production deployment, these should be secret
-  if NMDSS != '0' && NRGWS != '0'
+  if NMDSS != 0 && NRGWS != 0
     ansible.extra_vars = {
       fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45',
       monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==',
+      journal_size: 100,
+      monitor_interface: 'eth1',
+      cluster_network: "#{SUBNET}.0/24",
+      public_network: "#{SUBNET}.0/24",
       radosgw: 'true',
       mds: 'true',
     }
-  elsif NMDSS != '0'
+  elsif NMDSS != 0
     ansible.extra_vars = {
       fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45',
       monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==',
+      journal_size: 100,
+      monitor_interface: 'eth1',
+      cluster_network: "#{SUBNET}.0/24",
+      public_network: "#{SUBNET}.0/24",
       mds: 'true',
     }
-  elsif NRGWS != '0'
+  elsif NRGWS != 0
     ansible.extra_vars = {
       fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45',
       monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==',
+      journal_size: 100,
+      monitor_interface: 'eth1',
+      cluster_network: "#{SUBNET}.0/24",
+      public_network: "#{SUBNET}.0/24",
       radosgw: 'true',
     }
   else
@@ -54,6 +66,9 @@ ansible_provision = proc do |ansible|
       fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45',
       monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==',
       journal_size: 100,
+      monitor_interface: 'eth1',
+      cluster_network: "#{SUBNET}.0/24",
+      public_network: "#{SUBNET}.0/24",
     }
   end
   ansible.limit = 'all'

diff --git a/group_vars/all b/group_vars/all
index 9b93157caa4c93e1abf85d2a1c263db0d9a90009..6a3de3c995be5d8af0657fe4994138d2cc11692c 100644 (file)
--- a/group_vars/all
+++ b/group_vars/all
@@ -61,7 +61,7 @@ dummy:
 
 ## Monitor options
 #
-#monitor_interface: eth1
+#monitor_interface: interface
 #mon_osd_down_out_interval: 600
 #mon_osd_min_down_reporters: 7 # number of OSDs per host + 1
 #mon_clock_drift_allowed: .15
@@ -77,8 +77,8 @@ dummy:
 #pool_default_pgp_num: 128
 #pool_default_size: 2
 #pool_default_min_size: 1
-#cluster_network: 192.168.42.0/24
-#public_network: 192.168.42.0/24
+#cluster_network: 0.0.0.0/0
+#public_network: 0.0.0.0/0
 #osd_mkfs_type: xfs
 #osd_mkfs_options_xfs: -f -i size=2048
 #osd_mount_options_xfs: noatime

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 9888a9b6d875626a0e9f9dace365762e1d407f05..49b0270db114b5af0a522fa72b1fd649db150134 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -72,7 +72,7 @@ debug_mds_level: 20
 \r
 ## Monitor options\r
 #\r
-monitor_interface: eth1\r
+monitor_interface: interface\r
 mon_osd_down_out_interval: 600\r
 mon_osd_min_down_reporters: 7 # number of OSDs per host + 1\r
 mon_clock_drift_allowed: .15\r
@@ -88,8 +88,8 @@ pool_default_pg_num: 128
 pool_default_pgp_num: 128\r
 pool_default_size: 2\r
 pool_default_min_size: 1\r
-cluster_network: 192.168.42.0/24\r
-public_network: 192.168.42.0/24\r
+cluster_network: 0.0.0.0/0\r
+public_network: 0.0.0.0/0\r
 osd_mkfs_type: xfs\r
 osd_mkfs_options_xfs: -f -i size=2048\r
 osd_mount_options_xfs: noatime,largeio,inode64,swalloc\r

diff --git a/roles/ceph-common/tasks/check-mandatory-vars.yml b/roles/ceph-common/tasks/check-mandatory-vars.yml
new file mode 100644 (file)
index 0000000..d207bc1
--- /dev/null
+++ b/roles/ceph-common/tasks/check-mandatory-vars.yml
@@ -0,0 +1,16 @@
+---
+- name: Make sure journal_size configured
+  fail: msg="journal_size must be configured. See http://ceph.com/docs/master/rados/configuration/osd-config-ref/"
+  when: journal_size|int == 0
+
+- name: Make sure monitor_interface configured
+  fail: msg="monitor_interface must be configured. Interface for the monitor to listen on"
+  when: monitor_interface == 'interface'
+
+- name: Make sure cluster_network configured
+  fail: msg="cluster_network must be configured. Ceph replication network"
+  when: cluster_network == '0.0.0.0/0'
+
+- name: Make sure public_network configured
+  fail: msg="public_network must be configured. Ceph public network"
+  when: public_network == '0.0.0.0/0'

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 791b0d43c4d205567c90802e53c849e6b61cb61e..d15a596b920604ec6fe0c2883f2710bcbb42c8d4 100644 (file)
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -35,9 +35,7 @@
   register: cluster_uuid
   changed_when: False
 
-- name: Make sure journal_size configured
-  fail: msg="journal_size must be configured. See http://ceph.com/docs/master/rados/configuration/osd-config-ref/"
-  when: journal_size|int == 0
+- include: check-mandatory-vars.yml
 
 - name: Generate Ceph configuration file
   template: >