From d1cc6938da211c3488101d90b7c146f15e11d620 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 10 Jul 2022 00:17:49 +0900 Subject: [PATCH] Do not define service resource when service management is disabled Change-Id: Ic10cd3632e1b52945195cfefe904257e66958eba --- manifests/objectexpirer.pp | 14 +++---- manifests/proxy.pp | 27 ++++++++----- manifests/storage/account.pp | 14 +++---- manifests/storage/container.pp | 42 ++++++++++---------- manifests/storage/generic.pp | 42 ++++++++++---------- manifests/storage/object.pp | 29 +++++++------- spec/classes/swift_proxy_spec.rb | 16 ++------ spec/classes/swift_storage_account_spec.rb | 27 +++++-------- spec/classes/swift_storage_container_spec.rb | 28 +++++-------- spec/classes/swift_storage_object_spec.rb | 28 +++++-------- 10 files changed, 123 insertions(+), 144 deletions(-) diff --git a/manifests/objectexpirer.pp b/manifests/objectexpirer.pp index a9afa7fb..a95bfc66 100644 --- a/manifests/objectexpirer.pp +++ b/manifests/objectexpirer.pp @@ -200,13 +200,13 @@ class swift::objectexpirer( } else { $service_ensure = 'stopped' } - } - swift::service { 'swift-object-expirer': - os_family_service_name => $::swift::params::object_expirer_service_name, - service_ensure => $service_ensure, - enabled => $enabled, - config_file_name => 'object-expirer.conf', - service_provider => $service_provider, + swift::service { 'swift-object-expirer': + os_family_service_name => $::swift::params::object_expirer_service_name, + service_ensure => $service_ensure, + enabled => $enabled, + config_file_name => 'object-expirer.conf', + service_provider => $service_provider, + } } } diff --git a/manifests/proxy.pp b/manifests/proxy.pp index 2edf97ca..4ef361e6 100644 --- a/manifests/proxy.pp +++ b/manifests/proxy.pp @@ -192,7 +192,6 @@ class swift::proxy( ) inherits swift::params { include swift::deps - Swift_config<| |> ~> Service['swift-proxy-server'] validate_legacy(Boolean, 'validate_bool', $account_autocreate) validate_legacy(Boolean, 'validate_bool', $allow_account_management) @@ -316,15 +315,23 @@ class swift::proxy( } else { $service_ensure = 'stopped' } - } - # Require 'swift::proxy::' classes for each of the elements in pipeline. - swift::service { 'swift-proxy-server': - os_family_service_name => $::swift::params::proxy_server_service_name, - service_ensure => $service_ensure, - enabled => $enabled, - config_file_name => 'proxy-server.conf', - service_provider => $service_provider, - service_require => Class[$required_classes] + # Require 'swift::proxy::' classes for each of the elements in pipeline. + swift::service { 'swift-proxy-server': + os_family_service_name => $::swift::params::proxy_server_service_name, + service_ensure => $service_ensure, + enabled => $enabled, + config_file_name => 'proxy-server.conf', + service_provider => $service_provider, + 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'] } } diff --git a/manifests/storage/account.pp b/manifests/storage/account.pp index b699abb0..c91f2761 100644 --- a/manifests/storage/account.pp +++ b/manifests/storage/account.pp @@ -50,13 +50,13 @@ class swift::storage::account( } else { $service_ensure = 'stopped' } - } - swift::service { 'swift-account-reaper': - os_family_service_name => $::swift::params::account_reaper_service_name, - service_ensure => $service_ensure, - enabled => $enabled, - config_file_name => $config_file_name, - service_provider => $service_provider, + swift::service { 'swift-account-reaper': + os_family_service_name => $::swift::params::account_reaper_service_name, + service_ensure => $service_ensure, + enabled => $enabled, + config_file_name => $config_file_name, + service_provider => $service_provider, + } } } diff --git a/manifests/storage/container.pp b/manifests/storage/container.pp index 4d328a78..6d1fcc08 100644 --- a/manifests/storage/container.pp +++ b/manifests/storage/container.pp @@ -56,29 +56,29 @@ class swift::storage::container( } else { $service_ensure = 'stopped' } - } - swift::service { 'swift-container-updater': - os_family_service_name => $::swift::params::container_updater_service_name, - service_ensure => $service_ensure, - enabled => $enabled, - config_file_name => $config_file_name, - service_provider => $service_provider, - } + swift::service { 'swift-container-updater': + os_family_service_name => $::swift::params::container_updater_service_name, + service_ensure => $service_ensure, + enabled => $enabled, + config_file_name => $config_file_name, + service_provider => $service_provider, + } - swift::service { 'swift-container-sync': - os_family_service_name => $::swift::params::container_sync_service_name, - service_ensure => $service_ensure, - enabled => $enabled, - config_file_name => $config_file_name, - service_provider => $service_provider, - } + swift::service { 'swift-container-sync': + os_family_service_name => $::swift::params::container_sync_service_name, + service_ensure => $service_ensure, + enabled => $enabled, + config_file_name => $config_file_name, + service_provider => $service_provider, + } - swift::service { 'swift-container-sharder': - os_family_service_name => $::swift::params::container_sharder_service_name, - service_ensure => $service_ensure, - enabled => $enabled, - config_file_name => $config_file_name, - service_provider => $service_provider, + swift::service { 'swift-container-sharder': + os_family_service_name => $::swift::params::container_sharder_service_name, + service_ensure => $service_ensure, + enabled => $enabled, + config_file_name => $config_file_name, + service_provider => $service_provider, + } } } diff --git a/manifests/storage/generic.pp b/manifests/storage/generic.pp index 73f547af..fe25c026 100644 --- a/manifests/storage/generic.pp +++ b/manifests/storage/generic.pp @@ -66,29 +66,29 @@ define swift::storage::generic( } else { $service_ensure = 'stopped' } - } - swift::service { "swift-${name}-server": - os_family_service_name => getvar("::swift::params::${name}_server_service_name"), - service_ensure => $service_ensure, - enabled => $enabled, - config_file_name => $config_file_name, - service_provider => $service_provider, - } + swift::service { "swift-${name}-server": + os_family_service_name => getvar("::swift::params::${name}_server_service_name"), + service_ensure => $service_ensure, + enabled => $enabled, + config_file_name => $config_file_name, + service_provider => $service_provider, + } - swift::service { "swift-${name}-replicator": - os_family_service_name => getvar("::swift::params::${name}_replicator_service_name"), - service_ensure => $service_ensure, - enabled => $enabled, - config_file_name => $config_file_name, - service_provider => $service_provider, - } + swift::service { "swift-${name}-replicator": + os_family_service_name => getvar("::swift::params::${name}_replicator_service_name"), + service_ensure => $service_ensure, + enabled => $enabled, + config_file_name => $config_file_name, + service_provider => $service_provider, + } - swift::service { "swift-${name}-auditor": - os_family_service_name => getvar("::swift::params::${name}_auditor_service_name"), - service_ensure => $service_ensure, - enabled => $enabled, - config_file_name => $config_file_name, - service_provider => $service_provider, + swift::service { "swift-${name}-auditor": + os_family_service_name => getvar("::swift::params::${name}_auditor_service_name"), + service_ensure => $service_ensure, + enabled => $enabled, + config_file_name => $config_file_name, + service_provider => $service_provider, + } } } diff --git a/manifests/storage/object.pp b/manifests/storage/object.pp index 6e40246d..43a35c83 100644 --- a/manifests/storage/object.pp +++ b/manifests/storage/object.pp @@ -50,22 +50,21 @@ class swift::storage::object( } else { $service_ensure = 'stopped' } - } - swift::service { 'swift-object-updater': - os_family_service_name => $::swift::params::object_updater_service_name, - service_ensure => $service_ensure, - enabled => $enabled, - config_file_name => $config_file_name, - service_provider => $service_provider, - } + swift::service { 'swift-object-updater': + os_family_service_name => $::swift::params::object_updater_service_name, + service_ensure => $service_ensure, + enabled => $enabled, + config_file_name => $config_file_name, + service_provider => $service_provider, + } - swift::service { 'swift-object-reconstructor': - os_family_service_name => $::swift::params::object_reconstructor_service_name, - service_ensure => $service_ensure, - enabled => $enabled, - config_file_name => $config_file_name, - service_provider => $service_provider, + swift::service { 'swift-object-reconstructor': + os_family_service_name => $::swift::params::object_reconstructor_service_name, + service_ensure => $service_ensure, + enabled => $enabled, + config_file_name => $config_file_name, + service_provider => $service_provider, + } } - } diff --git a/spec/classes/swift_proxy_spec.rb b/spec/classes/swift_proxy_spec.rb index 5e18be7c..333327fd 100644 --- a/spec/classes/swift_proxy_spec.rb +++ b/spec/classes/swift_proxy_spec.rb @@ -322,23 +322,15 @@ describe 'swift::proxy' do end end - context 'with disabled service managing and service provider' do + context 'with disabled service management' do before do params.merge!({ - :manage_service => false, - :enabled => false, - :service_provider => 'swiftinit', + :manage_service => false, }) end - it 'configures swift-proxy-server service' do - should contain_service('swift-proxy-server').with( - :ensure => nil, - :name => 'swift-proxy-server', - :provider => 'swiftinit', - :enable => false, - :hasstatus => true, - ) + it 'does not configure swift-proxy-server service' do + should_not contain_service('swift-proxy-server') end end end diff --git a/spec/classes/swift_storage_account_spec.rb b/spec/classes/swift_storage_account_spec.rb index 9a961980..5b87cabd 100644 --- a/spec/classes/swift_storage_account_spec.rb +++ b/spec/classes/swift_storage_account_spec.rb @@ -46,28 +46,21 @@ describe 'swift::storage::account' do end end - context 'with disabled service managing and service provider' do + context 'with disabled service management' do before do params.merge!({ - :manage_service => false, - :enabled => false, - :service_provider => 'swiftinit', + :manage_service => false, }) end - it 'configures services' do - - { 'swift-account-server' => 'swift-account-server', - 'swift-account-replicator' => 'swift-account-replicator', - 'swift-account-reaper' => 'swift-account-reaper', - 'swift-account-auditor' => 'swift-account-auditor' }.each do |service_alias, service_name| - is_expected.to contain_service(service_alias).with( - :ensure => nil, - :name => service_name, - :enable => false, - :tag => 'swift-service', - :provider => 'swiftinit', - ) + it 'does not configure services' do + [ + 'swift-account-server', + 'swift-account-replicator', + 'swift-account-reaper', + 'swift-account-auditor' + ].each do |service_alias, service_name| + is_expected.to_not contain_service(service_alias) end end end diff --git a/spec/classes/swift_storage_container_spec.rb b/spec/classes/swift_storage_container_spec.rb index 3abe43ac..780a05d4 100644 --- a/spec/classes/swift_storage_container_spec.rb +++ b/spec/classes/swift_storage_container_spec.rb @@ -47,28 +47,22 @@ describe 'swift::storage::container' do end end - context 'with disabled service managing and service provider' do + context 'with disabled service management' do before do params.merge!({ - :manage_service => false, - :enabled => false, - :service_provider => 'swiftinit', + :manage_service => false, }) end - it 'configures services' do - { 'swift-container-server' => 'swift-container-server', - 'swift-container-replicator' => 'swift-container-replicator', - 'swift-container-updater' => 'swift-container-updater', - 'swift-container-auditor' => 'swift-container-auditor', - 'swift-container-sync' => 'swift-container-sync' }.each do |service_alias, service_name| - is_expected.to contain_service(service_alias).with( - :ensure => nil, - :name => service_name, - :enable => false, - :tag => 'swift-service', - :provider => 'swiftinit', - ) + it 'does not configure services' do + [ + 'swift-container-server', + 'swift-container-replicator', + 'swift-container-updater', + 'swift-container-auditor', + 'swift-container-sync' + ].each do |service_alias| + is_expected.to_not contain_service(service_alias) end end end diff --git a/spec/classes/swift_storage_object_spec.rb b/spec/classes/swift_storage_object_spec.rb index 7d27de1c..904fd66e 100644 --- a/spec/classes/swift_storage_object_spec.rb +++ b/spec/classes/swift_storage_object_spec.rb @@ -47,28 +47,22 @@ describe 'swift::storage::object' do end end - context 'with disabled service managing and service provider' do + context 'with disabled service management' do before do params.merge!({ - :manage_service => false, - :enabled => false, - :service_provider => 'swiftinit', + :manage_service => false, }) end - it 'configures services' do - { 'swift-object-server' => 'swift-object-server', - 'swift-object-reconstructor' => 'swift-object-reconstructor', - 'swift-object-replicator' => 'swift-object-replicator', - 'swift-object-updater' => 'swift-object-updater', - 'swift-object-auditor' => 'swift-object-auditor' }.each do |service_alias, service_name| - is_expected.to contain_service(service_alias).with( - :ensure => nil, - :name => service_name, - :enable => false, - :tag => 'swift-service', - :provider => 'swiftinit', - ) + it 'does not configure services' do + [ + 'swift-object-server', + 'swift-object-reconstructor', + 'swift-object-replicator', + 'swift-object-updater', + 'swift-object-auditor' + ].each do |service_alias| + is_expected.to_not contain_service(service_alias) end end end