From aec471a78d46d839e98026c4cb98acb412a7b424 Mon Sep 17 00:00:00 2001
From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Mon, 20 Mar 2017 11:44:53 -0400
Subject: Re-run gnocchi and ceilometer upgrade in step 5

Without this gnocchi resources types are not created
as they are skipped initially and the resources from
ceilometer wont make it to gnocchi.

Closes-bug: #1674421

Depends-On: I753f37e121b95813e345f200ad3f3e75ec4bd7e1

Change-Id: Ib45bf1b3e526a58f675d7555fe7bb5038dadeede
---
 manifests/profile/base/ceilometer/collector.pp     |  8 +++++++
 manifests/profile/base/gnocchi/api.pp              |  9 ++++++++
 .../re-run-ceilo-upgrade-0d9ba69fe4bfe780.yaml     |  5 +++++
 ...ipleo_profile_base_ceilometer_collector_spec.rb | 26 ++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 releasenotes/notes/re-run-ceilo-upgrade-0d9ba69fe4bfe780.yaml

diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp
index 20eab54..6b58286 100644
--- a/manifests/profile/base/ceilometer/collector.pp
+++ b/manifests/profile/base/ceilometer/collector.pp
@@ -85,4 +85,12 @@ class tripleo::profile::base::ceilometer::collector (
     include ::ceilometer::dispatcher::gnocchi
   }
 
+  # Re-run ceilometer-upgrade again in step 5 so gnocchi resource types
+  # are created safely.
+  if $step >= 5 and $sync_db {
+    exec {'ceilometer-db-upgrade':
+      command => 'ceilometer-upgrade --skip-metering-database',
+      path    => ['/usr/bin', '/usr/sbin'],
+    }
+  }
 }
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 5b4c0c2..79ee265 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -100,4 +100,13 @@ class tripleo::profile::base::gnocchi::api (
       default: { fail('Unrecognized gnocchi_backend parameter.') }
     }
   }
+
+  # Re-run gnochci upgrade with storage as swift/ceph should be up at this
+  # stage.
+  if $step >= 5 and $sync_db {
+    exec {'run gnocchi upgrade with storage':
+      command => 'gnocchi-upgrade --config-file=/etc/gnocchi/gnocchi.conf',
+      path    => ['/usr/bin', '/usr/sbin'],
+    }
+  }
 }
diff --git a/releasenotes/notes/re-run-ceilo-upgrade-0d9ba69fe4bfe780.yaml b/releasenotes/notes/re-run-ceilo-upgrade-0d9ba69fe4bfe780.yaml
new file mode 100644
index 0000000..c354431
--- /dev/null
+++ b/releasenotes/notes/re-run-ceilo-upgrade-0d9ba69fe4bfe780.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - Re-run gnocchi and ceilometer upgrade in step5. This is required
+    for gnocchi resource types to be created in ceilometer and gnocchi
+    to function properly.
diff --git a/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb
index 23b198a..0f9aad7 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb
@@ -128,6 +128,32 @@ 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
 
 
-- 
cgit 1.2.3-korg