summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-23 00:10:37 +0000
committerGerrit Code Review <review@openstack.org>2017-08-23 00:10:37 +0000
commit26d7023a07c12df582145b9ff68c6bdce60fb31a (patch)
tree49c658956e409423a204af901c311d728fc91d19
parent8c82dd1042aa543a91d066245e82928072a96687 (diff)
parent2bbc07a96951273ba49513b6ce48efdab0f9d070 (diff)
Merge "Add Ceilometer API and Collector service to roles_data"
-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 93a58df7..56f54f54 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 fdbec599..2cfc0cb9 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 7bc93a40..1dbb887f 100644
--- a/roles/Telemetry.yaml
+++ b/roles/Telemetry.yaml
@@ -16,6 +16,7 @@
- OS::TripleO::Services::CeilometerAgentCentral
- OS::TripleO::Services::CeilometerAgentNotification
- OS::TripleO::Services::CeilometerApi
+ - OS::TrieplO::Services::CeilometerCollector
- OS::TripleO::Services::CeilometerExpirer
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::GnocchiApi
diff --git a/roles_data.yaml b/roles_data.yaml
index 7799fdae..313fcaa9 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