Permalink
Browse files

Expose osd crush update on start option

Exposing osd crush update on start option enables usage of
crush maps to allow different performance characteristics
to be defined in the cloud.

Change-Id: I22dff5ea8fc4868b78d78d868d390e1924aa60e0
  • Loading branch information...
Erno Kuvaja
Erno Kuvaja committed Aug 17, 2016
1 parent aa78806 commit b1af406398488df7fc3d35263451f3e2ad802b9b
Showing with 14 additions and 0 deletions.
  1. +6 −0 manifests/init.pp
  2. +5 −0 manifests/profile/params.pp
  3. +3 −0 spec/classes/ceph_init_spec.rb
View
@@ -54,6 +54,10 @@
# when creating a pool.
# Optional. Integer. Default provided by Ceph.
#
+# [*osd_crush_update_on_start*] The default OSDs behaviour on start when
+# it comes to registering their location in the CRUSH map.
+# Optional. Boolean. Defaults to undef.
+#
# [*mon_osd_full_ratio*] Percentage of disk space used before
# an OSD considered full
# Optional. Integer e.g. 95, NOTE: ends in config as .95
@@ -136,6 +140,7 @@
$osd_pool_default_size = undef,
$osd_pool_default_min_size = undef,
$osd_pool_default_crush_rule = undef,
+ $osd_crush_update_on_start = undef,
$mon_osd_full_ratio = undef,
$mon_osd_nearfull_ratio = undef,
$mon_initial_members = undef,
@@ -180,6 +185,7 @@
'global/osd_pool_default_size': value => $osd_pool_default_size;
'global/osd_pool_default_min_size': value => $osd_pool_default_min_size;
'global/osd_pool_default_crush_rule': value => $osd_pool_default_crush_rule;
+ 'global/osd_crush_update_on_start': value => $osd_crush_update_on_start;
'global/mon_osd_full_ratio': value => $mon_osd_full_ratio;
'global/mon_osd_nearfull_ratio': value => $mon_osd_nearfull_ratio;
'global/mon_initial_members': value => $mon_initial_members;
@@ -60,6 +60,10 @@
# when creating a pool.
# Optional. Integer. Default provided by Ceph.
#
+# [*osd_crush_update_on_start*] The default OSDs behaviour on start when
+# it comes to registering their location in the CRUSH map.
+# Optional. Boolean. Defaults to undef.
+#
# [*mon_osd_full_ratio*] Percentage of disk space used before
# an OSD considered full
# Optional. Integer e.g. 95, NOTE: ends in config as .95
@@ -148,6 +152,7 @@
$osd_pool_default_pgp_num = undef,
$osd_pool_default_size = undef,
$osd_pool_default_min_size = undef,
+ $osd_crush_update_on_start = undef,
$cluster_network = undef,
$public_network = undef,
$public_addr = undef,
@@ -37,6 +37,7 @@
it { is_expected.to_not contain_ceph_config('global/osd_pool_default_size').with_value('3') }
it { is_expected.to_not contain_ceph_config('global/osd_pool_default_min_size').with_value('2') }
it { is_expected.to_not contain_ceph_config('global/osd_pool_default_crush_rule').with_value('0') }
+ it { is_expected.to_not contain_ceph_config('global/osd_crush_update_on_start').with_value(false) }
it { is_expected.to_not contain_ceph_config('global/mon_osd_full_ratio').with_value('90') }
it { is_expected.to_not contain_ceph_config('global/mon_osd_nearfull_ratio').with_value('85') }
it { is_expected.to_not contain_ceph_config('global/mon_initial_members').with_value('mon.01') }
@@ -72,6 +73,7 @@
:osd_pool_default_size => '2',
:osd_pool_default_min_size => '1',
:osd_pool_default_crush_rule => '10',
+ :osd_crush_update_on_start => false,
:mon_osd_full_ratio => '95',
:mon_osd_nearfull_ratio => '90',
:mon_initial_members => 'mon.01',
@@ -105,6 +107,7 @@
it { is_expected.to contain_ceph_config('global/osd_pool_default_size').with_value('2') }
it { is_expected.to contain_ceph_config('global/osd_pool_default_min_size').with_value('1') }
it { is_expected.to contain_ceph_config('global/osd_pool_default_crush_rule').with_value('10') }
+ it { is_expected.to contain_ceph_config('global/osd_crush_update_on_start').with_value(false) }
it { is_expected.to contain_ceph_config('global/mon_osd_full_ratio').with_value('95') }
it { is_expected.to contain_ceph_config('global/mon_osd_nearfull_ratio').with_value('90') }
it { is_expected.to contain_ceph_config('global/mon_initial_members').with_value('mon.01') }

0 comments on commit b1af406

Please sign in to comment.