From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Thu, 17 Aug 2017 14:47:08 +0000 (-0400)
Subject: Add Ceilometer API and Collector service to roles_data
X-Git-Tag: opnfv-6.0.0~200^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2bbc07a96951273ba49513b6ce48efdab0f9d070;p=apex-tripleo-heat-templates.git

Add Ceilometer API and Collector service to roles_data

Ceilometer api and collector are disabled in pike. During upgrade case,
if its not in the roles_data the disable task doesnt get picked
up and continue to run. This should be removed in Queen cycle.

Change-Id: I3bf555ac9488fc6622e6a62a809150082a85ea54
---

diff --git a/roles/Controller.yaml b/roles/Controller.yaml
index 224d1356..58737531 100644
--- a/roles/Controller.yaml
+++ b/roles/Controller.yaml
@@ -34,6 +34,8 @@
     - OS::TripleO::Services::CeilometerAgentNotification
     # FIXME: This service was disabled in Pike and this entry should be removed
     # in Queens.
+    - OS::TripleO::Services::CeilometerApi
+    - OS::TripleO::Services::CeilometerCollector
     - OS::TripleO::Services::CeilometerExpirer
     - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::CephMds
diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml
index 10d76dd7..09018fe4 100644
--- a/roles/ControllerOpenstack.yaml
+++ b/roles/ControllerOpenstack.yaml
@@ -27,6 +27,7 @@
     - OS::TripleO::Services::CeilometerAgentCentral
     - OS::TripleO::Services::CeilometerAgentNotification
     - OS::TripleO::Services::CeilometerApi
+    - OS::TripleO::Services::CeilometerCollector
     - OS::TripleO::Services::CeilometerExpirer
     - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::CephMds
diff --git a/roles/Telemetry.yaml b/roles/Telemetry.yaml
index b1c73798..31ac9a90 100644
--- a/roles/Telemetry.yaml
+++ b/roles/Telemetry.yaml
@@ -15,6 +15,7 @@
     - OS::TripleO::Services::CeilometerAgentCentral
     - OS::TripleO::Services::CeilometerAgentNotification
     - OS::TripleO::Services::CeilometerApi
+    - OS::TrieplO::Services::CeilometerCollector
     - OS::TripleO::Services::CeilometerExpirer
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
diff --git a/roles_data.yaml b/roles_data.yaml
index 8f670994..c24d3ada 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -37,6 +37,8 @@
     - OS::TripleO::Services::CeilometerAgentNotification
     # FIXME: This service was disabled in Pike and this entry should be removed
     # in Queens.
+    - OS::TripleO::Services::CeilometerApi
+    - OS::TripleO::Services::CeilometerCollector
     - OS::TripleO::Services::CeilometerExpirer
     - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::CephMds