aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-29 01:24:38 +0000
committerGerrit Code Review <review@openstack.org>2017-08-29 01:24:38 +0000
commit3dfffebaaef84c390e089d325c3c41f2182cd08e (patch)
tree956c857a8258c81447a437142bdae3bed128f3c9 /ci
parentfbd7283bc9a806790c3d272df4cfbe0c39049999 (diff)
parentca350fcb3a6095ec0fead1eccbf23c166bd57a67 (diff)
Merge "Enable ceilometer compute agent" into stable/pike
Diffstat (limited to 'ci')
-rw-r--r--ci/environments/scenario001-multinode-containers.yaml1
-rw-r--r--ci/environments/scenario001-multinode.yaml1
2 files changed, 2 insertions, 0 deletions
diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index fec958b..0cdbef1 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -73,6 +73,7 @@ parameter_defaults:
- OS::TripleO::Services::CeilometerAgentCentral
- OS::TripleO::Services::CeilometerAgentIpmi
- OS::TripleO::Services::CeilometerAgentNotification
+ - OS::TripleO::Services::ComputeCeilometerAgent
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd
- OS::TripleO::Services::GnocchiStatsd
diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml
index 54eef74..bab08a3 100644
--- a/ci/environments/scenario001-multinode.yaml
+++ b/ci/environments/scenario001-multinode.yaml
@@ -70,6 +70,7 @@ parameter_defaults:
- OS::TripleO::Services::CeilometerAgentCentral
- OS::TripleO::Services::CeilometerAgentIpmi
- OS::TripleO::Services::CeilometerAgentNotification
+ - OS::TripleO::Services::ComputeCeilometerAgent
- OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd
- OS::TripleO::Services::GnocchiStatsd