aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/sensu-client.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/sensu-client.yaml
parent3b7de8a2514cf9b90ee7aec3365bfbf4547175ad (diff)
parenta474ae82d5f157a48c997fb9df420442bd79dcbe (diff)
Merge "Add heat parameter for all of config_volume images"
Diffstat (limited to 'docker/services/sensu-client.yaml')
-rw-r--r--docker/services/sensu-client.yaml13
1 files changed, 10 insertions, 3 deletions
diff --git a/docker/services/sensu-client.yaml b/docker/services/sensu-client.yaml
index db6daf99..42b0c57a 100644
--- a/docker/services/sensu-client.yaml
+++ b/docker/services/sensu-client.yaml
@@ -12,6 +12,10 @@ parameters:
description: image
default: 'centos-binary-sensu-client:latest'
type: string
+ DockerSensuConfigImage:
+ description: The container image to use for the sensu config_volume
+ default: 'centos-binary-sensu-client:latest'
+ type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@ -98,10 +102,10 @@ outputs:
config_volume: sensu
puppet_tags: sensu_rabbitmq_config,sensu_client_config,sensu_check_config,sensu_check
step_config: *step_config
- config_image: &sensu_client_image
+ config_image:
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerSensuClientImage} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerSensuConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/sensu-client.json:
command: /usr/bin/sensu-client -d /etc/sensu/conf.d/ -l /var/log/sensu/sensu-client.log
@@ -112,7 +116,10 @@ outputs:
docker_config:
step_3:
sensu_client:
- image: *sensu_client_image
+ image:
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerSensuClientImage} ]
net: host
privileged: true
# NOTE(mmagr) kolla image changes the user to 'sensu', we need it