From 3fb220a6705b58fab10a3d15f56ea1b67617f109 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 18 May 2022 23:13:08 +0900
Subject: [PATCH] Manage ceilometer user before configuration phase

This is follow-up of 7d5b0acc0371e60115e8e235f5fe843687a7868a and
fixes the resource dependency removed.

This also looses unnecessary dependency about the nova-common package
and the ceilometer-common package.

Change-Id: I4935c56fe61fa92b6e7b3fddc952bda6f61b05a2
---
 manifests/agent/polling.pp                    | 3 ++-
 spec/classes/ceilometer_agent_polling_spec.rb | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp
index 9360d5fa..0242ac0a 100644
--- a/manifests/agent/polling.pp
+++ b/manifests/agent/polling.pp
@@ -121,7 +121,8 @@ class ceilometer::agent::polling (
     $compute_namespace_name = 'compute'
 
     Package <| title == 'ceilometer-common' |> -> User['ceilometer']
-    Package <| title == 'nova-common' |> -> Package['ceilometer-common']
+    Package <| title == 'nova-common' |> -> User['ceilometer']
+    User['ceilometer'] -> Anchor['ceilometer::install::end']
 
     ceilometer_config {
       'compute/instance_discovery_method': value => $instance_discovery_method;
diff --git a/spec/classes/ceilometer_agent_polling_spec.rb b/spec/classes/ceilometer_agent_polling_spec.rb
index 32d450d7..f0b9b391 100644
--- a/spec/classes/ceilometer_agent_polling_spec.rb
+++ b/spec/classes/ceilometer_agent_polling_spec.rb
@@ -25,8 +25,11 @@ describe 'ceilometer::agent::polling' do
         end
       }
 
+      it { should contain_package('ceilometer-common').with(
+       :before => /User\[ceilometer\]/
+      )}
       it { should contain_package('nova-common').with(
-       :before => /Package\[ceilometer-common\]/
+       :before => /User\[ceilometer\]/
       )}
 
       it {