From d794c048136c753c40bd670d77fe3f6f4071f5a1 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 23 May 2020 09:24:55 +0900 Subject: [PATCH] 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 --- manifests/compute.pp | 1 - ...endordata-from-compute-5751b84a5451164e.yaml | 6 ++++++ spec/classes/nova_compute_spec.rb | 17 ----------------- 3 files changed, 6 insertions(+), 18 deletions(-) create mode 100644 releasenotes/notes/remove-vendordata-from-compute-5751b84a5451164e.yaml diff --git a/manifests/compute.pp b/manifests/compute.pp index 1137285ac..ae45e4156 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -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.') diff --git a/releasenotes/notes/remove-vendordata-from-compute-5751b84a5451164e.yaml b/releasenotes/notes/remove-vendordata-from-compute-5751b84a5451164e.yaml new file mode 100644 index 000000000..6f267999b --- /dev/null +++ b/releasenotes/notes/remove-vendordata-from-compute-5751b84a5451164e.yaml @@ -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. diff --git a/spec/classes/nova_compute_spec.rb b/spec/classes/nova_compute_spec.rb index 996ad0253..12243a174 100644 --- a/spec/classes/nova_compute_spec.rb +++ b/spec/classes/nova_compute_spec.rb @@ -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' => '') - is_expected.to contain_nova_config('api/vendordata_providers').with('value' => '') - is_expected.to contain_nova_config('api/vendordata_dynamic_targets').with('value' => '') - is_expected.to contain_nova_config('api/vendordata_dynamic_connect_timeout').with('value' => '') - is_expected.to contain_nova_config('api/vendordata_dynamic_read_timeout').with('value' => '') - is_expected.to contain_nova_config('api/vendordata_dynamic_failure_fatal').with('value' => '') - is_expected.to contain_nova_config('vendordata_dynamic_auth/auth_type').with('value' => '') - is_expected.to contain_nova_config('vendordata_dynamic_auth/auth_url').with('value' => '') - is_expected.to contain_nova_config('vendordata_dynamic_auth/os_region_name').with('value' => '') - is_expected.to contain_nova_config('vendordata_dynamic_auth/password').with('value' => '') - 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' => '') - 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' => '') - 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