From 658956db2240d30329fee048edbd10c154695ddd Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 19 May 2020 09:17:34 +0900 Subject: [PATCH] Include vendordata in nova-api and nova-metadata-api Since the removal of deprecated vendordata parameters in each classes in puppet-nova[1], we should explicitly include nova::vendordata class in nova-api and nova-metadata-api so that required parameters are set in controller nodes. [1] https://opendev.org/openstack/puppet-nova/commit/296b10691680dd364ba8eaa0e938f9691c3744bb Conflicts: manifests/profile/base/nova/api.pp manifests/profile/base/nova/metadata.pp Closes-Bug: #1879418 Change-Id: I62d21ea910a976b1ba36b3c9a943d3547b40b7fc (cherry picked from commit 5df2066a87f53976c309c2204e952a121872ba9d) --- manifests/profile/base/nova/api.pp | 1 + manifests/profile/base/nova/metadata.pp | 1 + spec/classes/tripleo_profile_base_nova_api_spec.rb | 8 ++++++++ spec/classes/tripleo_profile_base_nova_metadata_spec.rb | 6 ++++++ 4 files changed, 16 insertions(+) diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp index 6762298b2..7a590b0b0 100644 --- a/manifests/profile/base/nova/api.pp +++ b/manifests/profile/base/nova/api.pp @@ -127,6 +127,7 @@ class tripleo::profile::base::nova::api ( include ::nova::cors include ::nova::network::neutron include ::nova::pci + include ::nova::vendordata } # Temporarily disable Nova API deployed in WSGI # https://bugs.launchpad.net/nova/+bug/1661360 diff --git a/manifests/profile/base/nova/metadata.pp b/manifests/profile/base/nova/metadata.pp index 0199bf1e1..63a915437 100644 --- a/manifests/profile/base/nova/metadata.pp +++ b/manifests/profile/base/nova/metadata.pp @@ -77,6 +77,7 @@ class tripleo::profile::base::nova::metadata ( include ::nova::cors include ::nova::network::neutron include ::nova::metadata + include ::nova::vendordata include ::tripleo::profile::base::apache class { '::nova::wsgi::apache_metadata': ssl_cert => $tls_certfile, diff --git a/spec/classes/tripleo_profile_base_nova_api_spec.rb b/spec/classes/tripleo_profile_base_nova_api_spec.rb index 701668291..ec172b70a 100644 --- a/spec/classes/tripleo_profile_base_nova_api_spec.rb +++ b/spec/classes/tripleo_profile_base_nova_api_spec.rb @@ -43,6 +43,8 @@ eos is_expected.to_not contain_class('nova::keystone::authtoken') is_expected.to_not contain_class('nova::api') is_expected.to_not contain_class('nova::cors') + is_expected.to_not contain_class('nova::pci') + is_expected.to_not contain_class('nova::vendordata') is_expected.to_not contain_class('nova::network::neutron') is_expected.to_not contain_class('nova::wsgi::apache_api') } @@ -61,6 +63,8 @@ eos is_expected.to contain_class('nova::keystone::authtoken') is_expected.to contain_class('nova::api') is_expected.to contain_class('nova::cors') + is_expected.to contain_class('nova::pci') + is_expected.to contain_class('nova::vendordata') is_expected.to contain_class('nova::network::neutron') is_expected.to_not contain_class('nova::wsgi::apache_api') } @@ -79,6 +83,8 @@ eos is_expected.to contain_class('nova::keystone::authtoken') is_expected.to_not contain_class('nova::api') is_expected.to_not contain_class('nova::cors') + is_expected.to_not contain_class('nova::pci') + is_expected.to_not contain_class('nova::vendordata') is_expected.to_not contain_class('nova::network::neutron') is_expected.to_not contain_class('nova::wsgi::apache_api') } @@ -114,6 +120,8 @@ eos is_expected.to contain_class('nova::keystone::authtoken') is_expected.to contain_class('nova::api') is_expected.to contain_class('nova::cors') + is_expected.to contain_class('nova::pci') + is_expected.to contain_class('nova::vendordata') is_expected.to contain_class('nova::network::neutron') is_expected.to contain_class('nova::wsgi::apache_api') } diff --git a/spec/classes/tripleo_profile_base_nova_metadata_spec.rb b/spec/classes/tripleo_profile_base_nova_metadata_spec.rb index 73c0e226b..256018768 100644 --- a/spec/classes/tripleo_profile_base_nova_metadata_spec.rb +++ b/spec/classes/tripleo_profile_base_nova_metadata_spec.rb @@ -45,6 +45,7 @@ eos is_expected.to_not contain_class('nova::wsgi::apache_metadata') is_expected.to_not contain_class('nova::network::neutron') is_expected.to_not contain_class('nova::metadata') + is_expected.to_not contain_class('nova::vendordata') is_expected.to_not contain_class('tripleo::profile::base::apache') } end @@ -62,6 +63,7 @@ eos is_expected.to_not contain_class('nova::wsgi::apache_metadata') is_expected.to_not contain_class('nova::network::neutron') is_expected.to_not contain_class('nova::metadata') + is_expected.to_not contain_class('nova::vendordata') is_expected.to_not contain_class('tripleo::profile::base::apache') } end @@ -80,6 +82,7 @@ eos is_expected.to contain_class('nova::wsgi::apache_metadata') is_expected.to contain_class('nova::network::neutron') is_expected.to contain_class('nova::metadata') + is_expected.to contain_class('nova::vendordata') is_expected.to contain_class('tripleo::profile::base::apache') } end @@ -98,6 +101,7 @@ eos is_expected.to contain_class('nova::wsgi::apache_metadata') is_expected.to contain_class('nova::network::neutron') is_expected.to contain_class('nova::metadata') + is_expected.to contain_class('nova::vendordata') is_expected.to contain_class('tripleo::profile::base::apache') } end @@ -116,6 +120,7 @@ eos is_expected.to contain_class('nova::wsgi::apache_metadata') is_expected.to contain_class('nova::network::neutron') is_expected.to contain_class('nova::metadata') + is_expected.to contain_class('nova::vendordata') is_expected.to contain_class('tripleo::profile::base::apache') } end @@ -145,6 +150,7 @@ eos :ssl_key => '/foo.key') is_expected.to contain_class('nova::network::neutron') is_expected.to contain_class('nova::metadata') + is_expected.to contain_class('nova::vendordata') is_expected.to contain_class('tripleo::profile::base::apache') } end