Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add validation task in docker services"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
gnocchi-statsd.yaml
diff --git
a/docker/services/gnocchi-statsd.yaml
b/docker/services/gnocchi-statsd.yaml
index
fea6b4b
..
00d218d
100644
(file)
--- a/
docker/services/gnocchi-statsd.yaml
+++ b/
docker/services/gnocchi-statsd.yaml
@@
-4,17
+4,11
@@
description: >
OpenStack containerized Gnocchi Statsd service
parameters:
OpenStack containerized Gnocchi Statsd service
parameters:
- DockerNamespace:
- description: namespace
- default: 'tripleoupstream'
- type: string
DockerGnocchiStatsdImage:
description: image
DockerGnocchiStatsdImage:
description: image
- default: 'centos-binary-gnocchi-statsd:latest'
type: string
DockerGnocchiConfigImage:
description: The container image to use for the gnocchi config_volume
type: string
DockerGnocchiConfigImage:
description: The container image to use for the gnocchi config_volume
- default: 'centos-binary-gnocchi-api:latest'
type: string
EndpointMap:
default: {}
type: string
EndpointMap:
default: {}
@@
-72,10
+66,7
@@
outputs:
config_volume: gnocchi
puppet_tags: gnocchi_config
step_config: *step_config
config_volume: gnocchi
puppet_tags: gnocchi_config
step_config: *step_config
- config_image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiConfigImage} ]
+ config_image: {get_param: DockerGnocchiConfigImage}
kolla_config:
/var/lib/kolla/config_files/gnocchi_statsd.json:
command: /usr/bin/gnocchi-statsd
kolla_config:
/var/lib/kolla/config_files/gnocchi_statsd.json:
command: /usr/bin/gnocchi-statsd
@@
-91,10
+82,7
@@
outputs:
docker_config:
step_4:
gnocchi_statsd:
docker_config:
step_4:
gnocchi_statsd:
- image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiStatsdImage} ]
+ image: {get_param: DockerGnocchiStatsdImage}
net: host
privileged: false
restart: always
net: host
privileged: false
restart: always