openstack/puppet-nova
Code Issues Proposed changes

Refactor logic about the instance_name_template parameter

Browse Source 
We don't need to implement a speicific logic to ensure the parameter is
absent but can pass $::os_service_default. This change updates default
of the instance_name_template parameter so that we can simplify our
current logic to manage the parameter.

Change-Id: I5fcd8e15c5b3a3386104506fb9f7b54eda2eb867
This commit is contained in:
Takashi Kajinami 2021-01-26 21:24:11 +09:00
parent 7efa708f76
commit 771b0bbe4e
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/api.pp
View File

@ -55,7 +55,7 @@
# #
# [*instance_name_template*] # [*instance_name_template*]
# (optional) Template string to be used to generate instance names # (optional) Template string to be used to generate instance names
# Defaults to undef # Defaults to $::os_service_default
# #
# [*sync_db*] # [*sync_db*]
# (optional) Run nova-manage db sync on api nodes after installing the package. # (optional) Run nova-manage db sync on api nodes after installing the package.
@ -199,7 +199,7 @@ class nova::api(
'nova.api.openstack.compute.limits:RateLimitingMiddleware.factory', 'nova.api.openstack.compute.limits:RateLimitingMiddleware.factory',
$validate = false, $validate = false,
$validation_options = {}, $validation_options = {},
$instance_name_template = undef, $instance_name_template = $::os_service_default,
$service_name = $::nova::params::api_service_name, $service_name = $::nova::params::api_service_name,
$metadata_service_name = $::nova::params::api_metadata_service_name, $metadata_service_name = $::nova::params::api_metadata_service_name,
$enable_proxy_headers_parsing = $::os_service_default, $enable_proxy_headers_parsing = $::os_service_default,
@ -235,13 +235,13 @@ class nova::api(
} }
if $instance_name_template { if $instance_name_template {
nova_config { $instance_name_template_real = $instance_name_template
'DEFAULT/instance_name_template': value => $instance_name_template;
}
} else { } else {
nova_config{ warning('Using a false value for instance_name_template is deprecated. Use $::os_service_default instead.')
'DEFAULT/instance_name_template': ensure => absent; $instance_name_template_real = $::os_service_default
} }
nova_config {
'DEFAULT/instance_name_template': value => $instance_name_template_real;
} }
# enable metadata in eventlet if we do not run metadata via wsgi (nova::metadata) # enable metadata in eventlet if we do not run metadata via wsgi (nova::metadata)

8
releasenotes/notes/nova-api-instance_name_template-default-01fb4a333ff60e19.yaml Normal file
View File

@ -0,0 +1,8 @@
---
deprecations:
- |
Default value of ``nova::api::instance_name_template`` has been changed
from ``undef`` to ``$::os_service_default``. The parameter still accepts
any false value then unsets the parameter, but this behavior will be
changed in a future release. Use ``$::os_service_default`` if you want to
use the default defined in nova implementation.

2
spec/classes/nova_api_spec.rb
View File

@ -43,11 +43,11 @@ describe 'nova::api' do
is_expected.to contain_nova_config('DEFAULT/enabled_apis').with_value('osapi_compute,metadata') is_expected.to contain_nova_config('DEFAULT/enabled_apis').with_value('osapi_compute,metadata')
end end
it { is_expected.to contain_nova_config('DEFAULT/instance_name_template').with_ensure('absent')}
it { is_expected.to contain_class('nova::availability_zone') } it { is_expected.to contain_class('nova::availability_zone') }
it 'configures various stuff' do it 'configures various stuff' do
is_expected.to contain_nova_config('DEFAULT/instance_name_template').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('wsgi/api_paste_config').with('value' => 'api-paste.ini') is_expected.to contain_nova_config('wsgi/api_paste_config').with('value' => 'api-paste.ini')
is_expected.to contain_nova_config('DEFAULT/osapi_compute_listen').with('value' => '0.0.0.0') is_expected.to contain_nova_config('DEFAULT/osapi_compute_listen').with('value' => '0.0.0.0')
is_expected.to contain_nova_config('DEFAULT/osapi_compute_listen_port').with('value' => '8774') is_expected.to contain_nova_config('DEFAULT/osapi_compute_listen_port').with('value' => '8774')