Do not define service resource when service management is disabled
Change-Id: Ic10cd3632e1b52945195cfefe904257e66958eba
This commit is contained in:
parent
9b05f2ecd7
commit
d1cc6938da
|
@ -200,13 +200,13 @@ class swift::objectexpirer(
|
||||||
} else {
|
} else {
|
||||||
$service_ensure = 'stopped'
|
$service_ensure = 'stopped'
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
swift::service { 'swift-object-expirer':
|
swift::service { 'swift-object-expirer':
|
||||||
os_family_service_name => $::swift::params::object_expirer_service_name,
|
os_family_service_name => $::swift::params::object_expirer_service_name,
|
||||||
service_ensure => $service_ensure,
|
service_ensure => $service_ensure,
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
config_file_name => 'object-expirer.conf',
|
config_file_name => 'object-expirer.conf',
|
||||||
service_provider => $service_provider,
|
service_provider => $service_provider,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -192,7 +192,6 @@ class swift::proxy(
|
||||||
) inherits swift::params {
|
) inherits swift::params {
|
||||||
|
|
||||||
include swift::deps
|
include swift::deps
|
||||||
Swift_config<| |> ~> Service['swift-proxy-server']
|
|
||||||
|
|
||||||
validate_legacy(Boolean, 'validate_bool', $account_autocreate)
|
validate_legacy(Boolean, 'validate_bool', $account_autocreate)
|
||||||
validate_legacy(Boolean, 'validate_bool', $allow_account_management)
|
validate_legacy(Boolean, 'validate_bool', $allow_account_management)
|
||||||
|
@ -316,15 +315,23 @@ class swift::proxy(
|
||||||
} else {
|
} else {
|
||||||
$service_ensure = 'stopped'
|
$service_ensure = 'stopped'
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
# Require 'swift::proxy::' classes for each of the elements in pipeline.
|
# Require 'swift::proxy::' classes for each of the elements in pipeline.
|
||||||
swift::service { 'swift-proxy-server':
|
swift::service { 'swift-proxy-server':
|
||||||
os_family_service_name => $::swift::params::proxy_server_service_name,
|
os_family_service_name => $::swift::params::proxy_server_service_name,
|
||||||
service_ensure => $service_ensure,
|
service_ensure => $service_ensure,
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
config_file_name => 'proxy-server.conf',
|
config_file_name => 'proxy-server.conf',
|
||||||
service_provider => $service_provider,
|
service_provider => $service_provider,
|
||||||
service_require => Class[$required_classes]
|
service_require => Class[$required_classes]
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
exec { 'vadate-proxy-pipeline':
|
||||||
|
command => '/usr/bin/true',
|
||||||
|
refreshonly => true,
|
||||||
|
require => Class[$required_classes],
|
||||||
|
before => Anchor['swift::config::end'],
|
||||||
|
}
|
||||||
|
Swift_Proxy_config<||> ~> Exec['vadate-proxy-pipeline']
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,13 +50,13 @@ class swift::storage::account(
|
||||||
} else {
|
} else {
|
||||||
$service_ensure = 'stopped'
|
$service_ensure = 'stopped'
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
swift::service { 'swift-account-reaper':
|
swift::service { 'swift-account-reaper':
|
||||||
os_family_service_name => $::swift::params::account_reaper_service_name,
|
os_family_service_name => $::swift::params::account_reaper_service_name,
|
||||||
service_ensure => $service_ensure,
|
service_ensure => $service_ensure,
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
config_file_name => $config_file_name,
|
config_file_name => $config_file_name,
|
||||||
service_provider => $service_provider,
|
service_provider => $service_provider,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,29 +56,29 @@ class swift::storage::container(
|
||||||
} else {
|
} else {
|
||||||
$service_ensure = 'stopped'
|
$service_ensure = 'stopped'
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
swift::service { 'swift-container-updater':
|
swift::service { 'swift-container-updater':
|
||||||
os_family_service_name => $::swift::params::container_updater_service_name,
|
os_family_service_name => $::swift::params::container_updater_service_name,
|
||||||
service_ensure => $service_ensure,
|
service_ensure => $service_ensure,
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
config_file_name => $config_file_name,
|
config_file_name => $config_file_name,
|
||||||
service_provider => $service_provider,
|
service_provider => $service_provider,
|
||||||
}
|
}
|
||||||
|
|
||||||
swift::service { 'swift-container-sync':
|
swift::service { 'swift-container-sync':
|
||||||
os_family_service_name => $::swift::params::container_sync_service_name,
|
os_family_service_name => $::swift::params::container_sync_service_name,
|
||||||
service_ensure => $service_ensure,
|
service_ensure => $service_ensure,
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
config_file_name => $config_file_name,
|
config_file_name => $config_file_name,
|
||||||
service_provider => $service_provider,
|
service_provider => $service_provider,
|
||||||
}
|
}
|
||||||
|
|
||||||
swift::service { 'swift-container-sharder':
|
swift::service { 'swift-container-sharder':
|
||||||
os_family_service_name => $::swift::params::container_sharder_service_name,
|
os_family_service_name => $::swift::params::container_sharder_service_name,
|
||||||
service_ensure => $service_ensure,
|
service_ensure => $service_ensure,
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
config_file_name => $config_file_name,
|
config_file_name => $config_file_name,
|
||||||
service_provider => $service_provider,
|
service_provider => $service_provider,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,29 +66,29 @@ define swift::storage::generic(
|
||||||
} else {
|
} else {
|
||||||
$service_ensure = 'stopped'
|
$service_ensure = 'stopped'
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
swift::service { "swift-${name}-server":
|
swift::service { "swift-${name}-server":
|
||||||
os_family_service_name => getvar("::swift::params::${name}_server_service_name"),
|
os_family_service_name => getvar("::swift::params::${name}_server_service_name"),
|
||||||
service_ensure => $service_ensure,
|
service_ensure => $service_ensure,
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
config_file_name => $config_file_name,
|
config_file_name => $config_file_name,
|
||||||
service_provider => $service_provider,
|
service_provider => $service_provider,
|
||||||
}
|
}
|
||||||
|
|
||||||
swift::service { "swift-${name}-replicator":
|
swift::service { "swift-${name}-replicator":
|
||||||
os_family_service_name => getvar("::swift::params::${name}_replicator_service_name"),
|
os_family_service_name => getvar("::swift::params::${name}_replicator_service_name"),
|
||||||
service_ensure => $service_ensure,
|
service_ensure => $service_ensure,
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
config_file_name => $config_file_name,
|
config_file_name => $config_file_name,
|
||||||
service_provider => $service_provider,
|
service_provider => $service_provider,
|
||||||
}
|
}
|
||||||
|
|
||||||
swift::service { "swift-${name}-auditor":
|
swift::service { "swift-${name}-auditor":
|
||||||
os_family_service_name => getvar("::swift::params::${name}_auditor_service_name"),
|
os_family_service_name => getvar("::swift::params::${name}_auditor_service_name"),
|
||||||
service_ensure => $service_ensure,
|
service_ensure => $service_ensure,
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
config_file_name => $config_file_name,
|
config_file_name => $config_file_name,
|
||||||
service_provider => $service_provider,
|
service_provider => $service_provider,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,22 +50,21 @@ class swift::storage::object(
|
||||||
} else {
|
} else {
|
||||||
$service_ensure = 'stopped'
|
$service_ensure = 'stopped'
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
swift::service { 'swift-object-updater':
|
swift::service { 'swift-object-updater':
|
||||||
os_family_service_name => $::swift::params::object_updater_service_name,
|
os_family_service_name => $::swift::params::object_updater_service_name,
|
||||||
service_ensure => $service_ensure,
|
service_ensure => $service_ensure,
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
config_file_name => $config_file_name,
|
config_file_name => $config_file_name,
|
||||||
service_provider => $service_provider,
|
service_provider => $service_provider,
|
||||||
}
|
}
|
||||||
|
|
||||||
swift::service { 'swift-object-reconstructor':
|
swift::service { 'swift-object-reconstructor':
|
||||||
os_family_service_name => $::swift::params::object_reconstructor_service_name,
|
os_family_service_name => $::swift::params::object_reconstructor_service_name,
|
||||||
service_ensure => $service_ensure,
|
service_ensure => $service_ensure,
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
config_file_name => $config_file_name,
|
config_file_name => $config_file_name,
|
||||||
service_provider => $service_provider,
|
service_provider => $service_provider,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -322,23 +322,15 @@ describe 'swift::proxy' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with disabled service managing and service provider' do
|
context 'with disabled service management' do
|
||||||
before do
|
before do
|
||||||
params.merge!({
|
params.merge!({
|
||||||
:manage_service => false,
|
:manage_service => false,
|
||||||
:enabled => false,
|
|
||||||
:service_provider => 'swiftinit',
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'configures swift-proxy-server service' do
|
it 'does not configure swift-proxy-server service' do
|
||||||
should contain_service('swift-proxy-server').with(
|
should_not contain_service('swift-proxy-server')
|
||||||
:ensure => nil,
|
|
||||||
:name => 'swift-proxy-server',
|
|
||||||
:provider => 'swiftinit',
|
|
||||||
:enable => false,
|
|
||||||
:hasstatus => true,
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -46,28 +46,21 @@ describe 'swift::storage::account' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with disabled service managing and service provider' do
|
context 'with disabled service management' do
|
||||||
before do
|
before do
|
||||||
params.merge!({
|
params.merge!({
|
||||||
:manage_service => false,
|
:manage_service => false,
|
||||||
:enabled => false,
|
|
||||||
:service_provider => 'swiftinit',
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'configures services' do
|
it 'does not configure services' do
|
||||||
|
[
|
||||||
{ 'swift-account-server' => 'swift-account-server',
|
'swift-account-server',
|
||||||
'swift-account-replicator' => 'swift-account-replicator',
|
'swift-account-replicator',
|
||||||
'swift-account-reaper' => 'swift-account-reaper',
|
'swift-account-reaper',
|
||||||
'swift-account-auditor' => 'swift-account-auditor' }.each do |service_alias, service_name|
|
'swift-account-auditor'
|
||||||
is_expected.to contain_service(service_alias).with(
|
].each do |service_alias, service_name|
|
||||||
:ensure => nil,
|
is_expected.to_not contain_service(service_alias)
|
||||||
:name => service_name,
|
|
||||||
:enable => false,
|
|
||||||
:tag => 'swift-service',
|
|
||||||
:provider => 'swiftinit',
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -47,28 +47,22 @@ describe 'swift::storage::container' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with disabled service managing and service provider' do
|
context 'with disabled service management' do
|
||||||
before do
|
before do
|
||||||
params.merge!({
|
params.merge!({
|
||||||
:manage_service => false,
|
:manage_service => false,
|
||||||
:enabled => false,
|
|
||||||
:service_provider => 'swiftinit',
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'configures services' do
|
it 'does not configure services' do
|
||||||
{ 'swift-container-server' => 'swift-container-server',
|
[
|
||||||
'swift-container-replicator' => 'swift-container-replicator',
|
'swift-container-server',
|
||||||
'swift-container-updater' => 'swift-container-updater',
|
'swift-container-replicator',
|
||||||
'swift-container-auditor' => 'swift-container-auditor',
|
'swift-container-updater',
|
||||||
'swift-container-sync' => 'swift-container-sync' }.each do |service_alias, service_name|
|
'swift-container-auditor',
|
||||||
is_expected.to contain_service(service_alias).with(
|
'swift-container-sync'
|
||||||
:ensure => nil,
|
].each do |service_alias|
|
||||||
:name => service_name,
|
is_expected.to_not contain_service(service_alias)
|
||||||
:enable => false,
|
|
||||||
:tag => 'swift-service',
|
|
||||||
:provider => 'swiftinit',
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -47,28 +47,22 @@ describe 'swift::storage::object' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with disabled service managing and service provider' do
|
context 'with disabled service management' do
|
||||||
before do
|
before do
|
||||||
params.merge!({
|
params.merge!({
|
||||||
:manage_service => false,
|
:manage_service => false,
|
||||||
:enabled => false,
|
|
||||||
:service_provider => 'swiftinit',
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'configures services' do
|
it 'does not configure services' do
|
||||||
{ 'swift-object-server' => 'swift-object-server',
|
[
|
||||||
'swift-object-reconstructor' => 'swift-object-reconstructor',
|
'swift-object-server',
|
||||||
'swift-object-replicator' => 'swift-object-replicator',
|
'swift-object-reconstructor',
|
||||||
'swift-object-updater' => 'swift-object-updater',
|
'swift-object-replicator',
|
||||||
'swift-object-auditor' => 'swift-object-auditor' }.each do |service_alias, service_name|
|
'swift-object-updater',
|
||||||
is_expected.to contain_service(service_alias).with(
|
'swift-object-auditor'
|
||||||
:ensure => nil,
|
].each do |service_alias|
|
||||||
:name => service_name,
|
is_expected.to_not contain_service(service_alias)
|
||||||
:enable => false,
|
|
||||||
:tag => 'swift-service',
|
|
||||||
:provider => 'swiftinit',
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue