From 5b0437919d1059dc616edacc901d585e5a49b10a Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 16 Apr 2021 22:02:56 +0900 Subject: [PATCH] Do not include client classes The client classes are used to install client packages like aodhclient, but there is no need to install these client packages when installing services. In addition, package installation is no longer enabled since services are containerized, so these classes are no longer effective. Change-Id: Iced0d69556f61e6facfb1462de3ad241b5dfcfcb --- manifests/profile/base/aodh.pp | 1 - manifests/profile/base/barbican.pp | 1 - manifests/profile/base/gnocchi.pp | 1 - manifests/profile/base/mistral.pp | 1 - spec/classes/tripleo_profile_base_aodh_spec.rb | 4 ---- spec/classes/tripleo_profile_base_barbican_spec.rb | 2 -- spec/classes/tripleo_profile_base_gnocchi_spec.rb | 4 ---- spec/classes/tripleo_profile_base_mistral_spec.rb | 4 ---- 8 files changed, 18 deletions(-) diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp index 16e8698a3..dcbee8adb 100644 --- a/manifests/profile/base/aodh.pp +++ b/manifests/profile/base/aodh.pp @@ -121,7 +121,6 @@ class tripleo::profile::base::aodh ( } include aodh::auth include aodh::config - include aodh::client include aodh::db::sync include aodh::logging } diff --git a/manifests/profile/base/barbican.pp b/manifests/profile/base/barbican.pp index 26620c76d..40a5e7884 100644 --- a/manifests/profile/base/barbican.pp +++ b/manifests/profile/base/barbican.pp @@ -31,6 +31,5 @@ class tripleo::profile::base::barbican ( if $step >= 3 { include barbican include barbican::config - include barbican::client } } diff --git a/manifests/profile/base/gnocchi.pp b/manifests/profile/base/gnocchi.pp index c926177ef..2aa41f183 100644 --- a/manifests/profile/base/gnocchi.pp +++ b/manifests/profile/base/gnocchi.pp @@ -94,7 +94,6 @@ class tripleo::profile::base::gnocchi ( include gnocchi::db include gnocchi::config include gnocchi::cors - include gnocchi::client include gnocchi::logging } } diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp index eb6727afb..e8e46e9a9 100644 --- a/manifests/profile/base/mistral.pp +++ b/manifests/profile/base/mistral.pp @@ -120,7 +120,6 @@ class tripleo::profile::base::mistral ( } include mistral::config include mistral::logging - include mistral::client include mistral::db::sync include mistral::cors } diff --git a/spec/classes/tripleo_profile_base_aodh_spec.rb b/spec/classes/tripleo_profile_base_aodh_spec.rb index 7ef49ec96..54db2c5d9 100644 --- a/spec/classes/tripleo_profile_base_aodh_spec.rb +++ b/spec/classes/tripleo_profile_base_aodh_spec.rb @@ -25,7 +25,6 @@ describe 'tripleo::profile::base::aodh' do is_expected.to_not contain_class('aodh') is_expected.to_not contain_class('aodh::auth') is_expected.to_not contain_class('aodh::config') - is_expected.to_not contain_class('aodh::client') is_expected.to_not contain_class('aodh::db::sync') end end @@ -45,7 +44,6 @@ describe 'tripleo::profile::base::aodh' do ) is_expected.to contain_class('aodh::auth') is_expected.to contain_class('aodh::config') - is_expected.to contain_class('aodh::client') is_expected.to contain_class('aodh::db::sync') end end @@ -60,7 +58,6 @@ describe 'tripleo::profile::base::aodh' do is_expected.to_not contain_class('aodh') is_expected.to_not contain_class('aodh::auth') is_expected.to_not contain_class('aodh::config') - is_expected.to_not contain_class('aodh::client') is_expected.to_not contain_class('aodh::db::sync') end end @@ -80,7 +77,6 @@ describe 'tripleo::profile::base::aodh' do ) is_expected.to contain_class('aodh::auth') is_expected.to contain_class('aodh::config') - is_expected.to contain_class('aodh::client') is_expected.to contain_class('aodh::db::sync') end end diff --git a/spec/classes/tripleo_profile_base_barbican_spec.rb b/spec/classes/tripleo_profile_base_barbican_spec.rb index 470b2c2d0..fa3bb164f 100644 --- a/spec/classes/tripleo_profile_base_barbican_spec.rb +++ b/spec/classes/tripleo_profile_base_barbican_spec.rb @@ -24,7 +24,6 @@ describe 'tripleo::profile::base::barbican' do is_expected.to contain_class('tripleo::profile::base::barbican') is_expected.to_not contain_class('barbican') is_expected.to_not contain_class('barbican::config') - is_expected.to_not contain_class('barbican::client') end end @@ -39,7 +38,6 @@ describe 'tripleo::profile::base::barbican' do ) is_expected.to contain_class('barbican') is_expected.to contain_class('barbican::config') - is_expected.to contain_class('barbican::client') end end end diff --git a/spec/classes/tripleo_profile_base_gnocchi_spec.rb b/spec/classes/tripleo_profile_base_gnocchi_spec.rb index e8de26428..3a7f7ea5e 100644 --- a/spec/classes/tripleo_profile_base_gnocchi_spec.rb +++ b/spec/classes/tripleo_profile_base_gnocchi_spec.rb @@ -33,7 +33,6 @@ describe 'tripleo::profile::base::gnocchi' do is_expected.to_not contain_class('gnocchi::db') is_expected.to_not contain_class('gnocchi::config') is_expected.to_not contain_class('gnocchi::cors') - is_expected.to_not contain_class('gnocchi::client') is_expected.to_not contain_class('gnocchi::logging') } end @@ -53,7 +52,6 @@ describe 'tripleo::profile::base::gnocchi' do is_expected.to contain_class('gnocchi::db') is_expected.to contain_class('gnocchi::config') is_expected.to contain_class('gnocchi::cors') - is_expected.to contain_class('gnocchi::client') is_expected.to contain_class('gnocchi::logging') } end @@ -69,7 +67,6 @@ describe 'tripleo::profile::base::gnocchi' do is_expected.to_not contain_class('gnocchi::db') is_expected.to_not contain_class('gnocchi::config') is_expected.to_not contain_class('gnocchi::cors') - is_expected.to_not contain_class('gnocchi::client') is_expected.to_not contain_class('gnocchi::logging') } end @@ -88,7 +85,6 @@ describe 'tripleo::profile::base::gnocchi' do is_expected.to contain_class('gnocchi::db') is_expected.to contain_class('gnocchi::config') is_expected.to contain_class('gnocchi::cors') - is_expected.to contain_class('gnocchi::client') is_expected.to contain_class('gnocchi::logging') } end diff --git a/spec/classes/tripleo_profile_base_mistral_spec.rb b/spec/classes/tripleo_profile_base_mistral_spec.rb index 31d32e926..436c2f9de 100644 --- a/spec/classes/tripleo_profile_base_mistral_spec.rb +++ b/spec/classes/tripleo_profile_base_mistral_spec.rb @@ -25,7 +25,6 @@ describe 'tripleo::profile::base::mistral' do is_expected.to_not contain_class('mistral') is_expected.to_not contain_class('mistral::config') is_expected.to_not contain_class('mistral::logging') - is_expected.to_not contain_class('mistral::client') is_expected.to_not contain_class('mistral::db::sync') is_expected.to_not contain_class('mistral::cors') end @@ -52,7 +51,6 @@ describe 'tripleo::profile::base::mistral' do ) is_expected.to contain_class('mistral::config') is_expected.to contain_class('mistral::logging') - is_expected.to contain_class('mistral::client') is_expected.to contain_class('mistral::db::sync') is_expected.to contain_class('mistral::cors') end @@ -69,7 +67,6 @@ describe 'tripleo::profile::base::mistral' do is_expected.to_not contain_class('mistral') is_expected.to_not contain_class('mistral::config') is_expected.to_not contain_class('mistral::logging') - is_expected.to_not contain_class('mistral::client') is_expected.to_not contain_class('mistral::db::sync') is_expected.to_not contain_class('mistral::cors') end @@ -96,7 +93,6 @@ describe 'tripleo::profile::base::mistral' do ) is_expected.to contain_class('mistral::config') is_expected.to contain_class('mistral::logging') - is_expected.to contain_class('mistral::client') is_expected.to contain_class('mistral::db::sync') is_expected.to contain_class('mistral::cors') end