Move ceilometer upgrade re-run out of collector

Since collector is deprecated, lets move this out of collector.pp
so it gets run and resource types are created appropriately even
when collector is not included.

Closes-bug: #1676961

Change-Id: I32445a891c34f519ab16dcecc81993f8909f6481

2 files changed, 25 insertions, 26 deletions

diff --git a/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb
index 0f9aad7..23b198a 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb
@@ -128,32 +128,6 @@ describe 'tripleo::profile::base::ceilometer::collector' do
         is_expected.to contain_class('ceilometer::dispatcher::gnocchi')
       end
     end
-
-    context 'with step 5 on bootstrap node' do
-      let(:params) { {
-        :step             => 5,
-        :bootstrap_node   => 'node.example.com',
-        :mongodb_node_ips => ['127.0.0.1',],
-        :mongodb_replset  => 'replicaset'
-      } }
-
-      it 'should trigger complete configuration' do
-        is_expected.to contain_exec('ceilometer-db-upgrade')
-      end
-    end
-
-    context 'with step 5 not on bootstrap node' do
-      let(:params) { {
-        :step             => 5,
-        :bootstrap_node   => 'somethingelse.example.com',
-        :mongodb_node_ips => ['127.0.0.1',],
-        :mongodb_replset  => 'replicaset'
-      } }
-
-      it 'should trigger complete configuration' do
-        is_expected.to_not contain_exec('ceilometer-db-upgrade')
-      end
-    end
   end
 
 
diff --git a/spec/classes/tripleo_profile_base_ceilometer_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_spec.rb
index 9173203..8c1d507 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_spec.rb
@@ -42,6 +42,31 @@ describe 'tripleo::profile::base::ceilometer' do
         is_expected.to contain_class('ceilometer::config')
       end
     end
+
+    context 'with step 5 with bootstrap node' do
+      let(:params) { {
+        :bootstrap_node => 'node.example.com',
+        :step             => 5,
+        :oslomsg_rpc_hosts => [ '127.0.0.1' ],
+        :oslomsg_rpc_username => 'ceilometer',
+        :oslomsg_rpc_password => 'foo',
+      } }
+
+      it 'should trigger complete configuration' do
+        is_expected.to contain_exec('ceilometer-db-upgrade')
+      end
+    end
+
+    context 'with step 5 without bootstrap node' do
+      let(:params) { {
+        :bootstrap_node => 'somethingelse.example.com',
+        :step             => 5,
+      } }
+
+      it 'should trigger complete configuration' do
+        is_expected.to_not contain_exec('ceilometer-db-upgrade')
+      end
+    end
   end