openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Set dhcp_domain for all nova services" into stable/train

This commit is contained in:
Zuul 2021-02-27 15:13:06 +00:00 committed by Gerrit Code Review
parent 4e737f79cd dbba136cae
commit 3b1bf54e9b
5 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/init.pp
View File

@ -404,6 +404,10 @@
# (optional) Allow attach between instance and volume in different availability zones.
# Defaults to $::os_service_default
#
# [*dhcp_domain*]
# (optional) domain to use for building the hostnames
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*notify_api_faults*]
@ -512,6 +516,7 @@ class nova(
$purge_config = false,
$my_ip = $::os_service_default,
$cross_az_attach = $::os_service_default,
$dhcp_domain = $::os_service_default,
# DEPRECATED PARAMETERS
$notify_api_faults = undef,
$image_service = undef,
@ -634,6 +639,8 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
nova_config { 'glance/api_servers': value => $glance_api_servers }
}
$dhcp_domain_real = pick($::nova::metadata::dhcp_domain, $dhcp_domain)
nova_config {
'DEFAULT/ssl_only': value => $ssl_only;
'DEFAULT/cert': value => $cert;
@ -644,6 +651,7 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
'DEFAULT/cpu_allocation_ratio': value => $cpu_allocation_ratio;
'DEFAULT/ram_allocation_ratio': value => $ram_allocation_ratio;
'DEFAULT/disk_allocation_ratio': value => $disk_allocation_ratio;
'DEFAULT/dhcp_domain': value => $dhcp_domain_real;
}
oslo::messaging::rabbit {'nova_config':

20
manifests/metadata.pp
View File

@ -24,11 +24,11 @@
# service.
# Defaults to $::os_service_default
#
# DEPRECATED
#
# [*dhcp_domain*]
# (optional) domain to use for building the hostnames
# Defaults to $::os_service_default
#
# DEPRECATED
# Defaults to undef.
#
# [*enabled_apis*]
# (optional) A list of apis to enable
@ -47,8 +47,8 @@ class nova::metadata(
$neutron_metadata_proxy_shared_secret = undef,
$metadata_cache_expiration = $::os_service_default,
$local_metadata_per_cell = $::os_service_default,
$dhcp_domain = $::os_service_default,
# DEPRECATED PARAMETERS
$dhcp_domain = undef,
$enabled_apis = undef,
$enable_proxy_headers_parsing = undef,
$max_request_body_size = undef,
@ -70,17 +70,9 @@ and will be removed in the future. Please use the one ::nova::api.')
warning('max_request_body_size in ::nova::metadata is deprecated, has no effect \
and will be removed in the future. Please use the one ::nova::api.')
}
# TODO(mwhahaha): backwards compatibility until we drop it from
# nova::network::network
if defined('$::nova::neutron::dhcp_domain') and $::nova::neutron::dhcp_domain != undef {
$dhcp_domain_real = $::nova::neutron::dhcp_domain
} else {
$dhcp_domain_real = $dhcp_domain
if $dhcp_domain {
warning('dhcp_domain in nova::metadata is deprecated, use nova::dhcp_domain instead.')
}
ensure_resource('nova_config', 'api/dhcp_domain', {
value => $dhcp_domain_real
})
nova_config {
'api/metadata_cache_expiration': value => $metadata_cache_expiration;

8
releasenotes/notes/deprecate-metadata-dhcp_domain-963c644692f72ede.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- |
The nova::metadata::dhcp_domain paramater has been deprecated by
nova::dhcp_domain as the nova config option is also required for
nova-compute.
[Bug `1903908 <https://bugs.launchpad.net/nova/+bug/1903908>`_]

4
spec/classes/nova_init_spec.rb
View File

@ -62,6 +62,7 @@ describe 'nova' do
is_expected.to contain_nova_config('DEFAULT/ssl_only').with_value(false)
is_expected.to contain_nova_config('DEFAULT/cert').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('DEFAULT/key').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('DEFAULT/dhcp_domain').with_value('<SERVICE DEFAULT>')
end
it 'configures block_device_allocate params' do
@ -110,6 +111,8 @@ describe 'nova' do
:ssl_only => true,
:cert => '/etc/ssl/private/snakeoil.pem',
:key => '/etc/ssl/certs/snakeoil.pem',
:dhcp_domain => 'foo',
}
end
@ -177,6 +180,7 @@ describe 'nova' do
is_expected.to contain_nova_config('DEFAULT/ssl_only').with_value(true)
is_expected.to contain_nova_config('DEFAULT/cert').with_value('/etc/ssl/private/snakeoil.pem')
is_expected.to contain_nova_config('DEFAULT/key').with_value('/etc/ssl/certs/snakeoil.pem')
is_expected.to contain_nova_config('DEFAULT/dhcp_domain').with_value('foo')
end
context 'with multiple notification_driver' do

4
spec/classes/nova_metadata_spec.rb
View File

@ -22,7 +22,7 @@ describe 'nova::metadata' do
it 'configures various stuff' do
is_expected.to contain_nova_config('api/metadata_cache_expiration').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('api/local_metadata_per_cell').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('api/dhcp_domain').with('value' => '<SERVICE DEFAULT>')
is_expected.to_not contain_nova_config('api/dhcp_domain')
end
it 'unconfigures neutron_metadata proxy' do
@ -44,7 +44,7 @@ describe 'nova::metadata' do
it 'configures various stuff' do
is_expected.to contain_nova_config('api/local_metadata_per_cell').with('value' => true)
is_expected.to contain_nova_config('api/metadata_cache_expiration').with('value' => '15')
is_expected.to contain_nova_config('api/dhcp_domain').with('value' => 'foo')
is_expected.to_not contain_nova_config('api/dhcp_domain')
is_expected.to contain_nova_config('neutron/service_metadata_proxy').with('value' => true)
is_expected.to contain_nova_config('neutron/metadata_proxy_shared_secret').with('value' => 'secrete').with_secret(true)
end