aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPradeep Kilambi <pkilambi@redhat.com>2017-08-17 10:47:08 -0400
committerPradeep Kilambi <pkilambi@redhat.com>2017-08-17 13:29:19 -0400
commit2bbc07a96951273ba49513b6ce48efdab0f9d070 (patch)
treed92a248f3e07e19f1cdb531cbe14048a68effa54
parent43027fefc081f75bc9ae1fd6f5b6f1978b003d7e (diff)
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
-rw-r--r--roles/Controller.yaml2
-rw-r--r--roles/ControllerOpenstack.yaml1
-rw-r--r--roles/Telemetry.yaml1
-rw-r--r--roles_data.yaml2
4 files changed, 6 insertions, 0 deletions
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