aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 13:05:36 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 13:05:36 +0000
commitd95394a01c47c46e8ffc3da5e9e4054ffffdc2ee (patch)
tree8e484bc3f5c9169df6d632f13647829c63980324 /environments
parentcea62f129cadbee58480765b3f9b6b0894ca418f (diff)
parent0849c76ca6b4ffeca9f267eb76bfebf69db581c0 (diff)
Merge "Containerize Ceilometer Agent Ipmi"
Diffstat (limited to 'environments')
-rw-r--r--environments/docker.yaml1
-rw-r--r--environments/services-docker/undercloud-ceilometer.yaml1
2 files changed, 2 insertions, 0 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml
index da4d83a9..5de0c8d9 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -45,6 +45,7 @@ resource_registry:
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::CeilometerAgentIpmi: ../docker/services/ceilometer-agent-ipmi.yaml
OS::TripleO::Services::CeilometerAgentCompute: ../docker/services/ceilometer-agent-compute.yaml
OS::TripleO::Services::CeilometerAgentNotification: ../docker/services/ceilometer-agent-notification.yaml
OS::TripleO::Services::Horizon: ../docker/services/horizon.yaml
diff --git a/environments/services-docker/undercloud-ceilometer.yaml b/environments/services-docker/undercloud-ceilometer.yaml
index 07a61c20..ca55b4d9 100644
--- a/environments/services-docker/undercloud-ceilometer.yaml
+++ b/environments/services-docker/undercloud-ceilometer.yaml
@@ -1,3 +1,4 @@
resource_registry:
OS::TripleO::Services::UndercloudCeilometerAgentCentral: ../../docker/services/ceilometer-agent-central.yaml
OS::TripleO::Services::UndercloudCeilometerAgentNotification: ../../docker/services/ceilometer-agent-notification.yaml
+ OS::TripleO::Services::UndercloudCeilometerAgentIpmi: ../../docker/services/ceilometer-agent-ipmi.yaml