openstack
/
puppet-nova
Code Issues Proposed changes

Add support for default_access_ip_network_name option 

Change-Id: I128befaadb1a83c2274eee61bb63a2e37f99db4e
This commit is contained in:
Rocky 2020-10-14 20:36:50 +11:00 committed by Takashi Kajinami
parent 9a29c21175
commit 50b311afaa
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/compute.pp
View File

@ -186,6 +186,12 @@
# and attach volume. # and attach volume.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*default_access_ip_network_name*]
# (optioanal) Name of the network to be used to set access IPs for
# instances. If there are multiple IPs to choose from, an arbitrary
# one will be chosen.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
# [*neutron_enabled*] # [*neutron_enabled*]
@ -252,6 +258,7 @@ class nova::compute (
$neutron_tunnel_numa_nodes = [], $neutron_tunnel_numa_nodes = [],
$live_migration_wait_for_vif_plug = $::os_service_default, $live_migration_wait_for_vif_plug = $::os_service_default,
$max_disk_devices_to_attach = $::os_service_default, $max_disk_devices_to_attach = $::os_service_default,
$default_access_ip_network_name = $::os_service_default,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$neutron_enabled = undef, $neutron_enabled = undef,
$install_bridge_utils = undef, $install_bridge_utils = undef,
@ -393,6 +400,7 @@ Use the same parameter in nova::api class.')
value => $consecutive_build_service_disable_threshold; value => $consecutive_build_service_disable_threshold;
'compute/live_migration_wait_for_vif_plug': value => $live_migration_wait_for_vif_plug; 'compute/live_migration_wait_for_vif_plug': value => $live_migration_wait_for_vif_plug;
'compute/max_disk_devices_to_attach': value => $max_disk_devices_to_attach; 'compute/max_disk_devices_to_attach': value => $max_disk_devices_to_attach;
'DEFAULT/default_access_ip_network_name': value => $default_access_ip_network_name;
} }
if ($vnc_enabled) { if ($vnc_enabled) {

6
releasenotes/notes/add_default_access_ip_network_name_option-9a20786776d0d402.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
The new ``nova::compute::default_access_ip_network_name`` parameter
has been added to support to set the network name for instances access
IPs.

3
spec/classes/nova_compute_spec.rb
View File

@ -57,6 +57,7 @@ describe 'nova::compute' do
it { is_expected.to contain_nova_config('compute/consecutive_build_service_disable_threshold').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_nova_config('compute/consecutive_build_service_disable_threshold').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('compute/live_migration_wait_for_vif_plug').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_nova_config('compute/live_migration_wait_for_vif_plug').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('compute/max_disk_devices_to_attach').with_value('<SERVICE DEFAULT>') } it { is_expected.to contain_nova_config('compute/max_disk_devices_to_attach').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_nova_config('DEFAULT/default_access_ip_network_name').with_value('<SERVICE DEFAULT>') }
it { is_expected.to_not contain_package('bridge-utils').with( it { is_expected.to_not contain_package('bridge-utils').with(
:ensure => 'present', :ensure => 'present',
@ -98,6 +99,7 @@ describe 'nova::compute' do
:consecutive_build_service_disable_threshold => '9', :consecutive_build_service_disable_threshold => '9',
:live_migration_wait_for_vif_plug => true, :live_migration_wait_for_vif_plug => true,
:max_disk_devices_to_attach => 20, :max_disk_devices_to_attach => 20,
:default_access_ip_network_name => 'public',
} }
end end
@ -150,6 +152,7 @@ describe 'nova::compute' do
it { is_expected.to contain_nova_config('compute/consecutive_build_service_disable_threshold').with_value('9') } it { is_expected.to contain_nova_config('compute/consecutive_build_service_disable_threshold').with_value('9') }
it { is_expected.to contain_nova_config('compute/live_migration_wait_for_vif_plug').with_value(true) } it { is_expected.to contain_nova_config('compute/live_migration_wait_for_vif_plug').with_value(true) }
it { is_expected.to contain_nova_config('compute/max_disk_devices_to_attach').with_value(20) } it { is_expected.to contain_nova_config('compute/max_disk_devices_to_attach').with_value(20) }
it { is_expected.to contain_nova_config('DEFAULT/default_access_ip_network_name').with_value('public') }
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')