Merge "Add default_ephemeral_format config option" into stable/ussuri
This commit is contained in:
commit
1fe4085899
|
@ -239,6 +239,11 @@
|
||||||
# loaded at a time.
|
# loaded at a time.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
|
# [*default_ephemeral_format*]
|
||||||
|
# (optional) The default format an ephemeral_volume will be formatted with
|
||||||
|
# on creation.
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
#
|
#
|
||||||
# [*vnc_keymap*]
|
# [*vnc_keymap*]
|
||||||
|
@ -318,6 +323,7 @@ class nova::compute (
|
||||||
$running_deleted_instance_poll_interval = $::os_service_default,
|
$running_deleted_instance_poll_interval = $::os_service_default,
|
||||||
$running_deleted_instance_timeout = $::os_service_default,
|
$running_deleted_instance_timeout = $::os_service_default,
|
||||||
$compute_monitors = $::os_service_default,
|
$compute_monitors = $::os_service_default,
|
||||||
|
$default_ephemeral_format = $::os_service_default,
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$vnc_keymap = undef,
|
$vnc_keymap = undef,
|
||||||
$neutron_enabled = undef,
|
$neutron_enabled = undef,
|
||||||
|
@ -473,6 +479,7 @@ Use the same parameter in nova::api class.')
|
||||||
value => $running_deleted_instance_poll_interval;
|
value => $running_deleted_instance_poll_interval;
|
||||||
'DEFAULT/running_deleted_instance_timeout': value => $running_deleted_instance_timeout;
|
'DEFAULT/running_deleted_instance_timeout': value => $running_deleted_instance_timeout;
|
||||||
'DEFAULT/compute_monitors': value => join(any2array($compute_monitors), ',');
|
'DEFAULT/compute_monitors': value => join(any2array($compute_monitors), ',');
|
||||||
|
'DEFAULT/default_ephemeral_format': value => $default_ephemeral_format;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($vnc_enabled) {
|
if ($vnc_enabled) {
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Add the ``default_ephemeral_format`` parameter which specifies default format
|
||||||
|
an ephemeral_volume will be formatted with on creation.
|
|
@ -50,6 +50,7 @@ describe 'nova::compute' do
|
||||||
it { is_expected.to contain_nova_config('DEFAULT/running_deleted_instance_poll_interval').with_value('<SERVICE DEFAULT>') }
|
it { is_expected.to contain_nova_config('DEFAULT/running_deleted_instance_poll_interval').with_value('<SERVICE DEFAULT>') }
|
||||||
it { is_expected.to contain_nova_config('DEFAULT/running_deleted_instance_timeout').with_value('<SERVICE DEFAULT>') }
|
it { is_expected.to contain_nova_config('DEFAULT/running_deleted_instance_timeout').with_value('<SERVICE DEFAULT>') }
|
||||||
it { is_expected.to contain_nova_config('DEFAULT/compute_monitors').with_value('<SERVICE DEFAULT>') }
|
it { is_expected.to contain_nova_config('DEFAULT/compute_monitors').with_value('<SERVICE DEFAULT>') }
|
||||||
|
it { is_expected.to contain_nova_config('DEFAULT/default_ephemeral_format').with_value('<SERVICE DEFAULT>') }
|
||||||
|
|
||||||
it { is_expected.to_not contain_package('cryptsetup').with( :ensure => 'present' )}
|
it { is_expected.to_not contain_package('cryptsetup').with( :ensure => 'present' )}
|
||||||
|
|
||||||
|
@ -123,6 +124,7 @@ describe 'nova::compute' do
|
||||||
:running_deleted_instance_poll_interval => '900',
|
:running_deleted_instance_poll_interval => '900',
|
||||||
:running_deleted_instance_timeout => '200',
|
:running_deleted_instance_timeout => '200',
|
||||||
:compute_monitors => ['cpu.virt_driver','fake'],
|
:compute_monitors => ['cpu.virt_driver','fake'],
|
||||||
|
:default_ephemeral_format => 'ext4',
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -193,6 +195,7 @@ describe 'nova::compute' do
|
||||||
it { is_expected.to contain_nova_config('DEFAULT/running_deleted_instance_poll_interval').with_value('900') }
|
it { is_expected.to contain_nova_config('DEFAULT/running_deleted_instance_poll_interval').with_value('900') }
|
||||||
it { is_expected.to contain_nova_config('DEFAULT/running_deleted_instance_timeout').with_value('200') }
|
it { is_expected.to contain_nova_config('DEFAULT/running_deleted_instance_timeout').with_value('200') }
|
||||||
it { is_expected.to contain_nova_config('DEFAULT/compute_monitors').with_value('cpu.virt_driver,fake') }
|
it { is_expected.to contain_nova_config('DEFAULT/compute_monitors').with_value('cpu.virt_driver,fake') }
|
||||||
|
it { is_expected.to contain_nova_config('DEFAULT/default_ephemeral_format').with_value('ext4') }
|
||||||
|
|
||||||
it 'configures nova config_drive_format to vfat' do
|
it 'configures nova config_drive_format to vfat' do
|
||||||
is_expected.to contain_nova_config('DEFAULT/config_drive_format').with_value('vfat')
|
is_expected.to contain_nova_config('DEFAULT/config_drive_format').with_value('vfat')
|
||||||
|
|
Loading…
Reference in New Issue