summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-17 13:32:55 +0000
committerGerrit Code Review <review@openstack.org>2017-05-17 13:32:55 +0000
commit013e27fe0d52c7572676b939020c1d07980096db (patch)
tree6e05a6922837becdcac72eb4b616d4137365371f /environments
parentea1008f09ffdf7975640491f08eed1bf1e2194fa (diff)
parent2d85067b9fe9a341b9c32080064c34310884f592 (diff)
Merge "Containerize Ceilometer Agents"
Diffstat (limited to 'environments')
-rw-r--r--environments/docker.yaml4
-rw-r--r--environments/services-docker/undercloud-ceilometer.yaml3
2 files changed, 7 insertions, 0 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 0c6028d0..991e991c 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -41,6 +41,9 @@ resource_registry:
OS::TripleO::Services::AodhNotifier: ../docker/services/aodh-notifier.yaml
OS::TripleO::Services::AodhListener: ../docker/services/aodh-listener.yaml
OS::TripleO::Services::PankoApi: ../docker/services/panko-api.yaml
+ OS::TripleO::Services::CeilometerAgentCentral: ../docker/services/ceilometer-agent-central.yaml
+ OS::TripleO::Services::CeilometerAgentCompute: ../docker/services/ceilometer-agent-compute.yaml
+ OS::TripleO::Services::CeilometerAgentNotification: ../docker/services/ceilometer-agent-notification.yaml
OS::TripleO::PostDeploySteps: ../docker/post.yaml
OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml
@@ -58,3 +61,4 @@ parameter_defaults:
- OS::TripleO::Services::NovaLibvirt
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
+ - OS::TripleO::Services::CeilometerAgentCompute
diff --git a/environments/services-docker/undercloud-ceilometer.yaml b/environments/services-docker/undercloud-ceilometer.yaml
new file mode 100644
index 00000000..07a61c20
--- /dev/null
+++ b/environments/services-docker/undercloud-ceilometer.yaml
@@ -0,0 +1,3 @@
+resource_registry:
+ OS::TripleO::Services::UndercloudCeilometerAgentCentral: ../../docker/services/ceilometer-agent-central.yaml
+ OS::TripleO::Services::UndercloudCeilometerAgentNotification: ../../docker/services/ceilometer-agent-notification.yaml