openstack/puppet-tripleo
Code Issues Proposed changes

Do not include client classes

Browse Source 
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
(cherry picked from commit 5b0437919d)
This commit is contained in:
Takashi Kajinami
2021-04-16 22:02:56 +09:00
parent 567ea3f035
commit e78135bdf2
8 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/profile/base/aodh.pp
View File

@@ -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
}

1
manifests/profile/base/barbican.pp
View File

@@ -31,6 +31,5 @@ class tripleo::profile::base::barbican (
if $step >= 3 {
include barbican
include barbican::config
include barbican::client
}
}

1
manifests/profile/base/gnocchi.pp
View File

@@ -94,7 +94,6 @@ class tripleo::profile::base::gnocchi (
include gnocchi::db
include gnocchi::config
include gnocchi::cors
include gnocchi::client
include gnocchi::logging
}
}

1
manifests/profile/base/mistral.pp
View File

@@ -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
}

4
spec/classes/tripleo_profile_base_aodh_spec.rb
View File

@@ -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

2
spec/classes/tripleo_profile_base_barbican_spec.rb
View File

@@ -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

4
spec/classes/tripleo_profile_base_gnocchi_spec.rb
View File

@@ -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

4
spec/classes/tripleo_profile_base_mistral_spec.rb
View File

@@ -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