Merge "Only add ceilometer user to nova group if using compute agent"…

… into stable/havana
xbezdick · Jan 15, 2014 · dc47463 · dc47463
2 parents 9590d78 + 7901dff
commit dc47463
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
@@ -22,7 +22,11 @@
 
   if $::ceilometer::params::libvirt_group {
     User['ceilometer'] {
-      groups +> [$::ceilometer::params::libvirt_group]
+      groups => ['nova', $::ceilometer::params::libvirt_group]
+    }
+  } else {
+    User['ceilometer'] {
+      groups => ['nova']
     }
   }
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -89,7 +89,6 @@
   user { 'ceilometer':
     name    => 'ceilometer',
     gid     => 'ceilometer',
-    groups  => ['nova'],
     system  => true,
     require => Package['ceilometer-common'],
   }

diff --git a/spec/classes/ceilometer_agent_compute_spec.rb b/spec/classes/ceilometer_agent_compute_spec.rb
@@ -24,9 +24,11 @@
       )
     end
 
-    it 'adds ceilometer user to libvirt group if required' do
+    it 'adds ceilometer user to nova group and, if required, to libvirt group' do
       if platform_params[:libvirt_group]
-        should contain_user('ceilometer').with_groups(/#{platform_params[:libvirt_group]}/)
+        should contain_user('ceilometer').with_groups(['nova', "#{platform_params[:libvirt_group]}"])
+      else
+        should contain_user('ceilometer').with_groups('nova')
       end
     end
 

diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
@@ -76,7 +76,6 @@
       should contain_user('ceilometer').with(
         :name    => 'ceilometer',
         :gid     => 'ceilometer',
-        :groups  => ['nova'],
         :system  => true,
         :require => 'Package[ceilometer-common]'
       )