openstack
/
puppet-nova
Code Issues Proposed changes

Do not include vendordata class in nova::compute 

Currently vendordata class is only included in nova-compute, but
this is inconsistent because the class is not included in nova-api
and nova-metadata-api, which also require vendordata configuration.

This patch removes automatical inclusion of vendordata class from
compute class, so that we are consistent about the inclusion of
vendordata class.

Change-Id: Ib2100f419afa80fd482404b0b3606e9c11d47ab5
This commit is contained in:
Takashi Kajinami 2020-05-23 09:24:55 +09:00
parent ba2405400d
commit d794c04813
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/compute.pp
View File

@ -260,7 +260,6 @@ class nova::compute (
include nova::pci
include nova::compute::vgpu
include nova::vendordata
if $vnc_keymap {
warning('vnc_keymap parameter is deprecated, has no effect and will be removed in the future.')

6
releasenotes/notes/remove-vendordata-from-compute-5751b84a5451164e.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
The ``nova::vendordata`` class is not automatically included by
``nova::compute``. The class should be included explicitly if vandordata
configuration is required at nova-compute.

17
spec/classes/nova_compute_spec.rb
View File

@ -50,23 +50,6 @@ describe 'nova::compute' do
it { is_expected.to contain_class('nova::availability_zone') }
it 'configures vendordata' do
is_expected.to contain_nova_config('api/vendordata_jsonfile_path').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('api/vendordata_providers').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('api/vendordata_dynamic_targets').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('api/vendordata_dynamic_connect_timeout').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('api/vendordata_dynamic_read_timeout').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('api/vendordata_dynamic_failure_fatal').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('vendordata_dynamic_auth/auth_type').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('vendordata_dynamic_auth/auth_url').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('vendordata_dynamic_auth/os_region_name').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('vendordata_dynamic_auth/password').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('vendordata_dynamic_auth/project_domain_name').with('value' => 'Default')
is_expected.to contain_nova_config('vendordata_dynamic_auth/project_name').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_nova_config('vendordata_dynamic_auth/user_domain_name').with('value' => 'Default')
is_expected.to contain_nova_config('vendordata_dynamic_auth/username').with('value' => '<SERVICE DEFAULT>')
end
it { is_expected.to contain_nova_config('DEFAULT/heal_instance_info_cache_interval').with_value('60') }
it 'installs genisoimage package and sets config_drive_format' do