Browse Source

Merge "Add default_ephemeral_format config option" into stable/victoria

changes/36/769136/1
Zuul 9 months ago
committed by Gerrit Code Review
parent
commit
5551ae58ed
  1. 7
      manifests/compute.pp
  2. 5
      releasenotes/notes/add_compute_default_ephemeral_format-c30f5463c1616903.yaml
  3. 3
      spec/classes/nova_compute_spec.rb

7
manifests/compute.pp

@ -249,6 +249,11 @@
# loaded at a time.
# 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
#
# [*neutron_enabled*]
@ -326,6 +331,7 @@ class nova::compute (
$running_deleted_instance_poll_interval = $::os_service_default,
$running_deleted_instance_timeout = $::os_service_default,
$compute_monitors = $::os_service_default,
$default_ephemeral_format = $::os_service_default,
# DEPRECATED PARAMETERS
$neutron_enabled = undef,
$install_bridge_utils = undef,
@ -481,6 +487,7 @@ Use the same parameter in nova::api class.')
value => $running_deleted_instance_poll_interval;
'DEFAULT/running_deleted_instance_timeout': value => $running_deleted_instance_timeout;
'DEFAULT/compute_monitors': value => join(any2array($compute_monitors), ',');
'DEFAULT/default_ephemeral_format': value => $default_ephemeral_format;
}
if ($vnc_enabled) {

5
releasenotes/notes/add_compute_default_ephemeral_format-c30f5463c1616903.yaml

@ -0,0 +1,5 @@
---
features:
- |
Add the ``default_ephemeral_format`` parameter which specifies default format
an ephemeral_volume will be formatted with on creation.

3
spec/classes/nova_compute_spec.rb

@ -68,6 +68,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_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/default_ephemeral_format').with_value('<SERVICE DEFAULT>') }
it { is_expected.to_not contain_package('bridge-utils').with(
:ensure => 'present',
@ -120,6 +121,7 @@ describe 'nova::compute' do
:running_deleted_instance_poll_interval => '900',
:running_deleted_instance_timeout => '200',
:compute_monitors => ['cpu.virt_driver','fake'],
:default_ephemeral_format => 'ext4',
}
end
@ -183,6 +185,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_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/default_ephemeral_format').with_value('ext4') }
it 'configures nova config_drive_format to vfat' do
is_expected.to contain_nova_config('DEFAULT/config_drive_format').with_value('vfat')

Loading…
Cancel
Save