Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 8c82dd1 2bbc07a)
Merge "Add Ceilometer API and Collector service to roles_data"
authorJenkins <jenkins@review.openstack.org>
Wed, 23 Aug 2017 00:10:37 +0000 (00:10 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 23 Aug 2017 00:10:37 +0000 (00:10 +0000)
1  2 
roles/Controller.yaml patch | diff1 | diff2 | blob | history
roles/ControllerOpenstack.yaml patch | diff1 | diff2 | blob | history
roles/Telemetry.yaml patch | diff1 | diff2 | blob | history
roles_data.yaml patch | diff1 | diff2 | blob | history

diff --cc roles/Controller.yaml
Simple merge
diff --cc roles/ControllerOpenstack.yaml
Simple merge
diff --cc roles/Telemetry.yaml
index 7bc93a4,31ac9a9..1dbb887
--- 1/roles/Telemetry.yaml
--- 2/roles/Telemetry.yaml
+++ b/roles/Telemetry.yaml
@@@ -16,8 -15,8 +16,9 @@@
      - 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
      - OS::TripleO::Services::GnocchiMetricd
      - OS::TripleO::Services::GnocchiStatsd
diff --cc roles_data.yaml
Simple merge