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 "nova-placement: switch auth_uri to keystone versionless endpoint" into stable...
[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
00d218d
..
0ebc83f
100644
(file)
--- a/
docker/services/gnocchi-statsd.yaml
+++ b/
docker/services/gnocchi-statsd.yaml
@@
-42,6
+42,9
@@
resources:
ContainersCommon:
type: ./containers-common.yaml
ContainersCommon:
type: ./containers-common.yaml
+ MySQLClient:
+ type: ../../puppet/services/database/mysql-client.yaml
+
GnocchiStatsdBase:
type: ../../puppet/services/gnocchi-statsd.yaml
properties:
GnocchiStatsdBase:
type: ../../puppet/services/gnocchi-statsd.yaml
properties:
@@
-58,8
+61,13
@@
outputs:
value:
service_name: {get_attr: [GnocchiStatsdBase, role_data, service_name]}
config_settings: {get_attr: [GnocchiStatsdBase, role_data, config_settings]}
value:
service_name: {get_attr: [GnocchiStatsdBase, role_data, service_name]}
config_settings: {get_attr: [GnocchiStatsdBase, role_data, config_settings]}
+ logging_source: {get_attr: [GnocchiStatsdBase, role_data, logging_source]}
+ logging_groups: {get_attr: [GnocchiStatsdBase, role_data, logging_groups]}
step_config: &step_config
step_config: &step_config
- get_attr: [GnocchiStatsdBase, role_data, step_config]
+ list_join:
+ - "\n"
+ - - {get_attr: [GnocchiStatsdBase, role_data, step_config]}
+ - {get_attr: [MySQLClient, role_data, step_config]}
service_config_settings: {get_attr: [GnocchiStatsdBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:
service_config_settings: {get_attr: [GnocchiStatsdBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:
@@
-75,12
+83,16
@@
outputs:
dest: "/"
merge: true
preserve_properties: true
dest: "/"
merge: true
preserve_properties: true
+ - source: "/var/lib/kolla/config_files/src-ceph/"
+ dest: "/etc/ceph/"
+ merge: true
+ preserve_properties: true
permissions:
- path: /var/log/gnocchi
owner: gnocchi:gnocchi
recurse: true
docker_config:
permissions:
- path: /var/log/gnocchi
owner: gnocchi:gnocchi
recurse: true
docker_config:
- step_
4
:
+ step_
5
:
gnocchi_statsd:
image: {get_param: DockerGnocchiStatsdImage}
net: host
gnocchi_statsd:
image: {get_param: DockerGnocchiStatsdImage}
net: host
@@
-93,6
+105,7
@@
outputs:
- /var/lib/kolla/config_files/gnocchi_statsd.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
- /var/lib/kolla/config_files/gnocchi_statsd.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
+ - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks:
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks:
@@
-100,6
+113,10
@@
outputs:
file:
path: /var/log/containers/gnocchi
state: directory
file:
path: /var/log/containers/gnocchi
state: directory
+ - name: ensure ceph configurations exist
+ file:
+ path: /etc/ceph
+ state: directory
upgrade_tasks:
- name: Stop and disable openstack-gnocchi-statsd service
tags: step2
upgrade_tasks:
- name: Stop and disable openstack-gnocchi-statsd service
tags: step2