Do not define service resource when service management is disabled

Change-Id: Ic10cd3632e1b52945195cfefe904257e66958eba

manifests/objectexpirer.pp

@@ -200,7 +200,6 @@ class swift::objectexpirer(
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
     swift::service { 'swift-object-expirer':
       os_family_service_name => $::swift::params::object_expirer_service_name,
@@ -210,3 +209,4 @@ class swift::objectexpirer(
       service_provider       => $service_provider,
     }
   }
+}

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,7 +315,6 @@ class swift::proxy(
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
     # Require 'swift::proxy::' classes for each of the elements in pipeline.
     swift::service { 'swift-proxy-server':
@@ -327,4 +325,13 @@ class swift::proxy(
       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']
+  }
 }

manifests/storage/account.pp

@@ -50,7 +50,6 @@ class swift::storage::account(
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
     swift::service { 'swift-account-reaper':
       os_family_service_name => $::swift::params::account_reaper_service_name,
@@ -60,3 +59,4 @@ class swift::storage::account(
       service_provider       => $service_provider,
     }
   }
+}

manifests/storage/container.pp

@@ -56,7 +56,6 @@ class swift::storage::container(
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
     swift::service { 'swift-container-updater':
       os_family_service_name => $::swift::params::container_updater_service_name,
@@ -82,3 +81,4 @@ class swift::storage::container(
       service_provider       => $service_provider,
     }
   }
+}

manifests/storage/generic.pp

@@ -66,7 +66,6 @@ define swift::storage::generic(
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
     swift::service { "swift-${name}-server":
       os_family_service_name => getvar("::swift::params::${name}_server_service_name"),
@@ -92,3 +91,4 @@ define swift::storage::generic(
       service_provider       => $service_provider,
     }
   }
+}

manifests/storage/object.pp

@@ -50,7 +50,6 @@ class swift::storage::object(
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
     swift::service { 'swift-object-updater':
       os_family_service_name => $::swift::params::object_updater_service_name,
@@ -67,5 +66,5 @@ class swift::storage::object(
       config_file_name       => $config_file_name,
       service_provider       => $service_provider,
     }
-
+  }
 }

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',
         })
       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

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',
         })
       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

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',
         })
       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

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',
         })
       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