Merge "Allow both DEFAULT/dhcp_domain and api/dhcp_domain to be set" into stable/train
This commit is contained in:
commit
5c5dc90040
|
@ -639,8 +639,6 @@ 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;
|
||||
|
@ -651,7 +649,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;
|
||||
'DEFAULT/dhcp_domain': value => $dhcp_domain;
|
||||
}
|
||||
|
||||
oslo::messaging::rabbit {'nova_config':
|
||||
|
|
|
@ -24,11 +24,11 @@
|
|||
# service.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# DEPRECATED
|
||||
#
|
||||
# [*dhcp_domain*]
|
||||
# (optional) domain to use for building the hostnames
|
||||
# Defaults to undef.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# DEPRECATED
|
||||
#
|
||||
# [*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,13 +70,11 @@ 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.')
|
||||
}
|
||||
if $dhcp_domain {
|
||||
warning('dhcp_domain in nova::metadata is deprecated, use nova::dhcp_domain instead.')
|
||||
}
|
||||
|
||||
nova_config {
|
||||
'api/metadata_cache_expiration': value => $metadata_cache_expiration;
|
||||
'api/local_metadata_per_cell': value => $local_metadata_per_cell;
|
||||
'api/dhcp_domain': value => $dhcp_domain;
|
||||
'api/metadata_cache_expiration': value => $metadata_cache_expiration;
|
||||
'api/local_metadata_per_cell': value => $local_metadata_per_cell;
|
||||
}
|
||||
|
||||
if ($neutron_metadata_proxy_shared_secret){
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
---
|
||||
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>`_]
|
||||
|
|
@ -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_not contain_nova_config('api/dhcp_domain')
|
||||
is_expected.to contain_nova_config('api/dhcp_domain').with('value' => '<SERVICE DEFAULT>')
|
||||
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_not contain_nova_config('api/dhcp_domain')
|
||||
is_expected.to contain_nova_config('api/dhcp_domain').with('value' => 'foo')
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue