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 "Replace outdated instruction with link to upstream doc"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
gnocchi-metricd.yaml
diff --git
a/docker/services/gnocchi-metricd.yaml
b/docker/services/gnocchi-metricd.yaml
index
2724805
..
1a0a1dd
100644
(file)
--- a/
docker/services/gnocchi-metricd.yaml
+++ b/
docker/services/gnocchi-metricd.yaml
@@
-4,19
+4,21
@@
description: >
OpenStack containerized Gnocchi Metricd service
parameters:
OpenStack containerized Gnocchi Metricd service
parameters:
- DockerNamespace:
- description: namespace
- default: 'tripleoupstream'
- type: string
DockerGnocchiMetricdImage:
description: image
DockerGnocchiMetricdImage:
description: image
- default: 'centos-binary-gnocchi-metricd:latest'
+ type: string
+ DockerGnocchiConfigImage:
+ description: The container image to use for the gnocchi config_volume
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
+ ServiceData:
+ default: {}
+ description: Dictionary packing service data
+ type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
@@
-44,6
+46,7
@@
resources:
type: ../../puppet/services/gnocchi-metricd.yaml
properties:
EndpointMap: {get_param: EndpointMap}
type: ../../puppet/services/gnocchi-metricd.yaml
properties:
EndpointMap: {get_param: EndpointMap}
+ ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
RoleName: {get_param: RoleName}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
RoleName: {get_param: RoleName}
@@
-63,13
+66,15
@@
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: &gnocchi_metricd_image
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiMetricdImage} ]
+ config_image: {get_param: DockerGnocchiConfigImage}
kolla_config:
kolla_config:
- /var/lib/kolla/config_files/gnocchi
-
metricd.json:
+ /var/lib/kolla/config_files/gnocchi
_
metricd.json:
command: /usr/bin/gnocchi-metricd
command: /usr/bin/gnocchi-metricd
+ config_files:
+ - source: "/var/lib/kolla/config_files/src/*"
+ dest: "/"
+ merge: true
+ preserve_properties: true
permissions:
- path: /var/log/gnocchi
owner: gnocchi:gnocchi
permissions:
- path: /var/log/gnocchi
owner: gnocchi:gnocchi
@@
-77,7
+82,7
@@
outputs:
docker_config:
step_4:
gnocchi_metricd:
docker_config:
step_4:
gnocchi_metricd:
- image:
*gnocchi_metricd_image
+ image:
{get_param: DockerGnocchiMetricdImage}
net: host
privileged: false
restart: always
net: host
privileged: false
restart: always
@@
-85,8
+90,8
@@
outputs:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- - /var/lib/kolla/config_files/gnocchi
-
metricd.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/
gnocchi/etc/gnocchi/:/etc/gnocchi/
:ro
+ - /var/lib/kolla/config_files/gnocchi
_
metricd.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/config-data/
puppet-generated/gnocchi/:/var/lib/kolla/config_files/src
:ro
- /var/log/containers/gnocchi:/var/log/gnocchi
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
- /var/log/containers/gnocchi:/var/log/gnocchi
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS