Skip to content

Commit b1af406

Browse files
author
Erno Kuvaja
committed
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
1 parent aa78806 commit b1af406

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

manifests/init.pp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@
5454
# when creating a pool.
5555
# Optional. Integer. Default provided by Ceph.
5656
#
57+
# [*osd_crush_update_on_start*] The default OSDs behaviour on start when
58+
# it comes to registering their location in the CRUSH map.
59+
# Optional. Boolean. Defaults to undef.
60+
#
5761
# [*mon_osd_full_ratio*] Percentage of disk space used before
5862
# an OSD considered full
5963
# Optional. Integer e.g. 95, NOTE: ends in config as .95
@@ -136,6 +140,7 @@
136140
$osd_pool_default_size = undef,
137141
$osd_pool_default_min_size = undef,
138142
$osd_pool_default_crush_rule = undef,
143+
$osd_crush_update_on_start = undef,
139144
$mon_osd_full_ratio = undef,
140145
$mon_osd_nearfull_ratio = undef,
141146
$mon_initial_members = undef,
@@ -180,6 +185,7 @@
180185
'global/osd_pool_default_size': value => $osd_pool_default_size;
181186
'global/osd_pool_default_min_size': value => $osd_pool_default_min_size;
182187
'global/osd_pool_default_crush_rule': value => $osd_pool_default_crush_rule;
188+
'global/osd_crush_update_on_start': value => $osd_crush_update_on_start;
183189
'global/mon_osd_full_ratio': value => $mon_osd_full_ratio;
184190
'global/mon_osd_nearfull_ratio': value => $mon_osd_nearfull_ratio;
185191
'global/mon_initial_members': value => $mon_initial_members;

manifests/profile/params.pp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@
6060
# when creating a pool.
6161
# Optional. Integer. Default provided by Ceph.
6262
#
63+
# [*osd_crush_update_on_start*] The default OSDs behaviour on start when
64+
# it comes to registering their location in the CRUSH map.
65+
# Optional. Boolean. Defaults to undef.
66+
#
6367
# [*mon_osd_full_ratio*] Percentage of disk space used before
6468
# an OSD considered full
6569
# Optional. Integer e.g. 95, NOTE: ends in config as .95
@@ -148,6 +152,7 @@
148152
$osd_pool_default_pgp_num = undef,
149153
$osd_pool_default_size = undef,
150154
$osd_pool_default_min_size = undef,
155+
$osd_crush_update_on_start = undef,
151156
$cluster_network = undef,
152157
$public_network = undef,
153158
$public_addr = undef,

spec/classes/ceph_init_spec.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
it { is_expected.to_not contain_ceph_config('global/osd_pool_default_size').with_value('3') }
3838
it { is_expected.to_not contain_ceph_config('global/osd_pool_default_min_size').with_value('2') }
3939
it { is_expected.to_not contain_ceph_config('global/osd_pool_default_crush_rule').with_value('0') }
40+
it { is_expected.to_not contain_ceph_config('global/osd_crush_update_on_start').with_value(false) }
4041
it { is_expected.to_not contain_ceph_config('global/mon_osd_full_ratio').with_value('90') }
4142
it { is_expected.to_not contain_ceph_config('global/mon_osd_nearfull_ratio').with_value('85') }
4243
it { is_expected.to_not contain_ceph_config('global/mon_initial_members').with_value('mon.01') }
@@ -72,6 +73,7 @@
7273
:osd_pool_default_size => '2',
7374
:osd_pool_default_min_size => '1',
7475
:osd_pool_default_crush_rule => '10',
76+
:osd_crush_update_on_start => false,
7577
:mon_osd_full_ratio => '95',
7678
:mon_osd_nearfull_ratio => '90',
7779
:mon_initial_members => 'mon.01',
@@ -105,6 +107,7 @@
105107
it { is_expected.to contain_ceph_config('global/osd_pool_default_size').with_value('2') }
106108
it { is_expected.to contain_ceph_config('global/osd_pool_default_min_size').with_value('1') }
107109
it { is_expected.to contain_ceph_config('global/osd_pool_default_crush_rule').with_value('10') }
110+
it { is_expected.to contain_ceph_config('global/osd_crush_update_on_start').with_value(false) }
108111
it { is_expected.to contain_ceph_config('global/mon_osd_full_ratio').with_value('95') }
109112
it { is_expected.to contain_ceph_config('global/mon_osd_nearfull_ratio').with_value('90') }
110113
it { is_expected.to contain_ceph_config('global/mon_initial_members').with_value('mon.01') }

0 commit comments

Comments
 (0)