Do not use any specific service provider for ubuntu

Let's do not hard code some service provider names for Debian
as it done for RedHat OS.

Change-Id: I95b52432723c1d2ed10fb7ab78df57869127cfeb

manifests/params.pp

@@ -26,11 +26,7 @@ class swift::params {
       $account_reaper_service_name       = 'swift-account-reaper'
       $account_replicator_service_name   = 'swift-account-replicator'
       $swift3                            = 'swift-plugin-s3'
-      if $::operatingsystem == 'Ubuntu' {
+      $service_provider                  = undef
-        $service_provider = 'upstart'
-      } else {
-        $service_provider = undef
-      }
     }
     'RedHat': {
       $package_name                      = 'openstack-swift'

spec/classes/swift_objectexpirer_spec.rb

@@ -69,7 +69,7 @@ describe 'swift::objectexpirer' do
     let :platform_params do
       { :object_expirer_package_name => 'swift-object-expirer',
         :service_name                => 'swift-object-expirer',
-        :service_provider            => 'upstart' }
+        :service_provider            => nil }
     end
 
     it_configures 'swift-object-expirer'

spec/classes/swift_proxy_spec.rb

@@ -43,7 +43,7 @@ describe 'swift::proxy' do
 
       it { is_expected.to contain_service('swift-proxy-server').with(
         {:ensure     => 'running',
-         :provider   => 'upstart',
+         :provider   => nil,
          :enable     => true,
          :hasstatus  => true,
          :subscribe  => 'Concat[/etc/swift/proxy-server.conf]',
@@ -290,7 +290,7 @@ describe 'swift::proxy' do
 
     let :platform_params do
       {   'swift-proxy-server' => 'swift-proxy',
-          'service_provider'   => 'upstart'
+          'service_provider'   => nil
       }
     end
     it_configures 'swift-proxy-server'

spec/classes/swift_storage_account_spec.rb

@@ -81,7 +81,7 @@ describe 'swift::storage::account' do
           'swift-account-reaper'     => 'swift-account-reaper',
           'swift-account-auditor'    => 'swift-account-auditor'
         },
-        :service_provider => 'upstart'
+        :service_provider => nil
       }
     end
 

spec/classes/swift_storage_all_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'swift::storage::all' do
-  # TODO I am not testing the upstart code b/c it should be temporary
 
   let :facts do
     {
@@ -65,13 +64,13 @@ describe 'swift::storage::all' do
       ['object', 'container', 'account'].each do |type|
         it { is_expected.to contain_package("swift-#{type}").with_ensure('present') }
         it { is_expected.to contain_service("swift-#{type}-server").with(
-          {:provider  => 'upstart',
+          {:provider  => nil,
            :ensure    => 'running',
            :enable    => true,
            :hasstatus => true
           })}
         it { is_expected.to contain_service("swift-#{type}-replicator").with(
-          {:provider  => 'upstart',
+          {:provider  => nil,
            :ensure    => 'running',
            :enable    => true,
            :hasstatus => true

spec/classes/swift_storage_container_spec.rb

@@ -81,7 +81,7 @@ describe 'swift::storage::container' do
           'swift-container-updater'    => 'swift-container-updater',
           'swift-container-auditor'    => 'swift-container-auditor'
         },
-        :service_provider => 'upstart'
+        :service_provider => nil
       }
     end
 

spec/classes/swift_storage_object_spec.rb

@@ -82,7 +82,7 @@ describe 'swift::storage::object' do
           'swift-object-updater'    => 'swift-object-updater',
           'swift-object-auditor'    => 'swift-object-auditor'
         },
-        :service_provider => 'upstart'
+        :service_provider => nil
       }
     end
 

spec/classes/swift_storage_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'swift::storage' do
-  # TODO I am not testing the upstart code b/c it should be temporary
-
   let :facts do
     {
       :operatingsystem => 'Ubuntu',

spec/defines/swift_storage_generic_spec.rb

@@ -113,7 +113,7 @@ describe 'swift::storage::generic' do
          'swift-object-server'        => 'swift-object',
          'swift-object-replicator'    => 'swift-object-replicator',
          'swift-object-auditor'       => 'swift-object-auditor',
-         'service_provider'           => 'upstart'
+         'service_provider'           => nil
       }
     end