Merge "Remove unnecessary group assignment"

manifests/init.pp

@@ -65,11 +65,6 @@ class swift(
     tag    => ['openstack', 'swift-package'],
   }
 
-  user {'swift':
-    ensure  => present,
-    require => Anchor['swift::install::end'],
-  }
-
   swift_config {
     'swift-hash/swift_hash_path_suffix': value => $swift_hash_path_suffix;
     'swift-hash/swift_hash_path_prefix': value => $swift_hash_path_prefix;

manifests/proxy/ceilometer.pp

@@ -29,12 +29,6 @@
 #   Enable or not ceilometer fragment
 #   Defaults to 'present'
 #
-# [*group*]
-#   Group name to add to 'swift' user.
-#   ceilometer/eventlet: set 'ceilometer' (default)
-#   ceilometer/wsgi: set $::apache::group
-#   Defaults to 'ceilometer'
-#
 # [*nonblocking_notify*]
 #   Whether to send events to messaging driver in a background thread
 #   Defaults to false
@@ -112,6 +106,10 @@
 #   (Optional) Complete public Identity API endpoint.
 #   Defaults to undef
 #
+# [*group*]
+#   Group name to add to 'swift' user.
+#   Defaults to undef
+#
 # == Examples
 #
 # == Authors
@@ -128,7 +126,6 @@ class swift::proxy::ceilometer(
   $topic                      = undef,
   $control_exchange           = undef,
   $ensure                     = 'present',
-  $group                      = 'ceilometer',
   $nonblocking_notify         = false,
   $ignore_projects            = ['services'],
   $auth_url                   = 'http://127.0.0.1:5000',
@@ -147,17 +144,12 @@ class swift::proxy::ceilometer(
   $rabbit_use_ssl             = $::os_service_default,
   $kombu_ssl_version          = $::os_service_default,
   # DEPRECATED PARAMETERS
-  $auth_uri                   = undef
+  $auth_uri                   = undef,
+  $group                      = undef,
 ) inherits swift {
 
   include swift::deps
 
-  User['swift'] {
-    groups +> $group,
-  }
-
-  Package<| tag == 'ceilometer-package' |> -> User['swift']
-
   if defined(Service['swift-proxy-server']) {
     Package['python-ceilometermiddleware'] -> Service['swift-proxy-server']
   }
@@ -166,6 +158,10 @@ class swift::proxy::ceilometer(
     warning('The swift::proxy::ceilometer::auth_uri parameter was deprecated, and has no effect')
   }
 
+  if $group != undef {
+    warning('The group parameer has been deprecated and has no effect now.')
+  }
+
   if $password == undef {
     warning('Usage of the default password is deprecated and will be removed in a future release. \
 Please set password parameter')

releasenotes/notes/deprecate-ceilometer-group-81408169438202b6.yaml

@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The ``swift::proxy::ceilometer::group`` parameter has been deprecated and
+    has no effect now.

spec/classes/swift_proxy_ceilometer_spec.rb

@@ -20,7 +20,6 @@ describe 'swift::proxy::ceilometer' do
       it { is_expected.to contain_swift_proxy_config('filter:ceilometer/paste.filter_factory').with_value('ceilometermiddleware.swift:filter_factory') }
       it { is_expected.to contain_swift_proxy_config('filter:ceilometer/url').with_value('rabbit://user_1:user_1_passw@1.1.1.1:5673/rabbit').with_secret(true) }
       it { is_expected.to contain_swift_proxy_config('filter:ceilometer/nonblocking_notify').with_value('false') }
-      it { is_expected.to contain_user('swift').with_groups('ceilometer') }
 
       it { is_expected.to contain_package('python-ceilometermiddleware').with(
         :ensure => 'present',
@@ -31,8 +30,7 @@ describe 'swift::proxy::ceilometer' do
 
     describe "when overriding default parameters with rabbit driver" do
       let :params do
-        { :group                 => 'www-data',
+        { :default_transport_url => 'rabbit://user_1:user_1_passw@1.1.1.1:5673/rabbit',
-          :default_transport_url => 'rabbit://user_1:user_1_passw@1.1.1.1:5673/rabbit',
           :driver                => 'messagingv2',
           :topic                 => 'notifications',
           :control_exchange      => 'swift',
@@ -50,7 +48,6 @@ describe 'swift::proxy::ceilometer' do
       end
 
       context 'with single rabbit host' do
-        it { is_expected.to contain_user('swift').with_groups('www-data') }
         it { is_expected.to contain_swift_proxy_config('filter:ceilometer/paste.filter_factory').with_value('ceilometermiddleware.swift:filter_factory') }
         it { is_expected.to contain_swift_proxy_config('filter:ceilometer/url').with_value('rabbit://user_1:user_1_passw@1.1.1.1:5673/rabbit').with_secret(true) }
         it { is_expected.to contain_swift_proxy_config('filter:ceilometer/driver').with_value('messagingv2') }

spec/classes/swift_spec.rb

@@ -28,8 +28,6 @@ describe 'swift' do
         }
       end
 
-      it {is_expected.to contain_user('swift')}
-
       it 'configures swift.conf' do
         is_expected.to contain_swift_config(
           'swift-hash/swift_hash_path_suffix').with_value('string')