From dab61ed2c0d4f07e764941092bf209c8a0050e89 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 26 May 2020 11:24:44 +0900 Subject: [PATCH] Include vendordata class in nova-compute The nova::vendordata is not automatically loaded now, so we should explicitly include the class in the manifest for nova-compute to configure vendordata parameters in nova-compute. Depends-on: https://review.opendev.org/#/c/730424/ Change-Id: I0843d38bd9fe0cc9bf92f533a7dbe83a0b4f297d --- manifests/profile/base/nova/compute.pp | 1 + .../classes/tripleo_profile_base_nova_compute_spec.rb | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp index 3e1df96c2..d05831d94 100644 --- a/manifests/profile/base/nova/compute.pp +++ b/manifests/profile/base/nova/compute.pp @@ -58,6 +58,7 @@ class tripleo::profile::base::nova::compute ( # deploy basic bits for nova include tripleo::profile::base::nova include nova::cinder + include nova::vendordata if $keymgr_api_class { warning('The keymgr_api_class parameter is deprecated, use keymgr_backend') diff --git a/spec/classes/tripleo_profile_base_nova_compute_spec.rb b/spec/classes/tripleo_profile_base_nova_compute_spec.rb index 078b09943..b07265c4a 100644 --- a/spec/classes/tripleo_profile_base_nova_compute_spec.rb +++ b/spec/classes/tripleo_profile_base_nova_compute_spec.rb @@ -32,6 +32,8 @@ describe 'tripleo::profile::base::nova::compute' do ) is_expected.to_not contain_class('tripleo::profile::base::nova') + is_expected.to_not contain_class('nova::cinder') + is_expected.to_not contain_class('nova::vendordata') is_expected.to_not contain_class('nova::compute') is_expected.to_not contain_class('nova::network::neutron') } @@ -62,7 +64,8 @@ eos :keymgr_backend => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager', ) is_expected.to contain_class('tripleo::profile::base::nova') - is_expected.to contain_class('tripleo::profile::base::nova') + is_expected.to contain_class('nova::cinder') + is_expected.to contain_class('nova::vendordata') is_expected.to contain_class('nova::compute').with( :keymgr_backend => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager', ) @@ -90,7 +93,8 @@ eos it { is_expected.to contain_class('tripleo::profile::base::nova::compute') is_expected.to contain_class('tripleo::profile::base::nova') - is_expected.to contain_class('tripleo::profile::base::nova') + is_expected.to contain_class('nova::cinder') + is_expected.to contain_class('nova::vendordata') is_expected.to contain_class('nova::compute') is_expected.to contain_class('nova::network::neutron') is_expected.to contain_package('nfs-utils') @@ -103,7 +107,8 @@ eos it { is_expected.to contain_class('tripleo::profile::base::nova::compute') is_expected.to contain_class('tripleo::profile::base::nova') - is_expected.to contain_class('tripleo::profile::base::nova') + is_expected.to contain_class('nova::cinder') + is_expected.to contain_class('nova::vendordata') is_expected.to contain_class('nova::compute') is_expected.to contain_class('nova::network::neutron') is_expected.to contain_package('nfs-utils')