From 93c48e918f860b93ded95230a91d513a81a1e1fe Mon Sep 17 00:00:00 2001 From: Rocky Date: Wed, 14 Oct 2020 20:36:50 +1100 Subject: [PATCH] Add support for default_access_ip_network_name option Change-Id: I128befaadb1a83c2274eee61bb63a2e37f99db4e (cherry picked from commit 50b311afaaac52eeb3205334d3d51f5abc4ebdd9) --- manifests/compute.pp | 8 ++++++++ ...lt_access_ip_network_name_option-9a20786776d0d402.yaml | 6 ++++++ spec/classes/nova_compute_spec.rb | 3 +++ 3 files changed, 17 insertions(+) create mode 100644 releasenotes/notes/add_default_access_ip_network_name_option-9a20786776d0d402.yaml diff --git a/manifests/compute.pp b/manifests/compute.pp index 4f7d4bb16..9c25d9b8a 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -186,6 +186,12 @@ # and attach volume. # 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 # # [*neutron_enabled*] @@ -252,6 +258,7 @@ class nova::compute ( $neutron_tunnel_numa_nodes = [], $live_migration_wait_for_vif_plug = $::os_service_default, $max_disk_devices_to_attach = $::os_service_default, + $default_access_ip_network_name = $::os_service_default, # DEPRECATED PARAMETERS $neutron_enabled = undef, $install_bridge_utils = undef, @@ -393,6 +400,7 @@ Use the same parameter in nova::api class.') value => $consecutive_build_service_disable_threshold; '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; + 'DEFAULT/default_access_ip_network_name': value => $default_access_ip_network_name; } if ($vnc_enabled) { diff --git a/releasenotes/notes/add_default_access_ip_network_name_option-9a20786776d0d402.yaml b/releasenotes/notes/add_default_access_ip_network_name_option-9a20786776d0d402.yaml new file mode 100644 index 000000000..0b0d47361 --- /dev/null +++ b/releasenotes/notes/add_default_access_ip_network_name_option-9a20786776d0d402.yaml @@ -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. diff --git a/spec/classes/nova_compute_spec.rb b/spec/classes/nova_compute_spec.rb index 76cf82f82..d5920149d 100644 --- a/spec/classes/nova_compute_spec.rb +++ b/spec/classes/nova_compute_spec.rb @@ -57,6 +57,7 @@ describe 'nova::compute' do it { is_expected.to contain_nova_config('compute/consecutive_build_service_disable_threshold').with_value('') } it { is_expected.to contain_nova_config('compute/live_migration_wait_for_vif_plug').with_value('') } it { is_expected.to contain_nova_config('compute/max_disk_devices_to_attach').with_value('') } + it { is_expected.to contain_nova_config('DEFAULT/default_access_ip_network_name').with_value('') } it { is_expected.to_not contain_package('bridge-utils').with( :ensure => 'present', @@ -98,6 +99,7 @@ describe 'nova::compute' do :consecutive_build_service_disable_threshold => '9', :live_migration_wait_for_vif_plug => true, :max_disk_devices_to_attach => 20, + :default_access_ip_network_name => 'public', } 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/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('DEFAULT/default_access_ip_network_name').with_value('public') } it 'configures nova config_drive_format to vfat' do is_expected.to contain_nova_config('DEFAULT/config_drive_format').with_value('vfat')