aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/ceilometer-agent-central.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-29 20:12:59 +0000
committerGerrit Code Review <review@openstack.org>2017-06-29 20:12:59 +0000
commite8d8eae59cf7fac1378ddb6dc78c847abb77c22f (patch)
tree2290212e2b6f529824dc499badfba578a892421b /docker/services/ceilometer-agent-central.yaml
parent3b7de8a2514cf9b90ee7aec3365bfbf4547175ad (diff)
parenta474ae82d5f157a48c997fb9df420442bd79dcbe (diff)
Merge "Add heat parameter for all of config_volume images"
Diffstat (limited to 'docker/services/ceilometer-agent-central.yaml')
-rw-r--r--docker/services/ceilometer-agent-central.yaml13
1 files changed, 10 insertions, 3 deletions
diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml
index 9cec4a61..af1f47ad 100644
--- a/docker/services/ceilometer-agent-central.yaml
+++ b/docker/services/ceilometer-agent-central.yaml
@@ -12,6 +12,10 @@ parameters:
description: image
default: 'centos-binary-ceilometer-central:latest'
type: string
+ DockerCeilometerConfigImage:
+ description: The container image to use for the ceilometer config_volume
+ default: 'centos-binary-ceilometer-central:latest'
+ type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@ -63,10 +67,10 @@ outputs:
config_volume: ceilometer
puppet_tags: ceilometer_config
step_config: *step_config
- config_image: &ceilometer_agent_central_image
+ config_image:
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerCentralImage} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/ceilometer_agent_central.json:
command: /usr/bin/ceilometer-polling --polling-namespaces central
@@ -74,7 +78,10 @@ outputs:
step_3:
ceilometer_init_log:
start_order: 0
- image: *ceilometer_agent_central_image
+ image: &ceilometer_agent_central_image
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerCeilometerCentralImage} ]
user: root
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
volumes: