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 "Support for Satellite Capsule in rhel-registration" into stable/pike
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
opendaylight-api.yaml
diff --git
a/docker/services/opendaylight-api.yaml
b/docker/services/opendaylight-api.yaml
index
6a62f65
..
dbe49e9
100644
(file)
--- a/
docker/services/opendaylight-api.yaml
+++ b/
docker/services/opendaylight-api.yaml
@@
-60,6
+60,8
@@
outputs:
config_settings:
map_merge:
- get_attr: [OpenDaylightBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [OpenDaylightBase, role_data, config_settings]
+ logging_source: {get_attr: [OpenDaylightBase, role_data, logging_source]}
+ logging_groups: {get_attr: [OpenDaylightBase, role_data, logging_groups]}
step_config: &step_config
get_attr: [OpenDaylightBase, role_data, step_config]
# BEGIN DOCKER SETTINGS
step_config: &step_config
get_attr: [OpenDaylightBase, role_data, step_config]
# BEGIN DOCKER SETTINGS
@@
-97,10
+99,21
@@
outputs:
-
- /var/lib/kolla/config_files/opendaylight_api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/opendaylight/:/var/lib/kolla/config_files/src:ro
-
- /var/lib/kolla/config_files/opendaylight_api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/opendaylight/:/var/lib/kolla/config_files/src:ro
+ - /var/log/containers/opendaylight:/opt/opendaylight/data/log
+ - /var/lib/opendaylight/journal:/opt/opendaylight/journal
+ - /var/lib/opendaylight/snapshots:/opt/opendaylight/snapshots
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-
+ host_prep_tasks:
+ - name: create persistent directories
+ file:
+ path: "{{ item }}"
+ state: directory
+ with_items:
+ - /var/log/containers/opendaylight
+ - /var/lib/opendaylight/snapshots
+ - /var/lib/opendaylight/journal
upgrade_tasks:
- name: Stop and disable opendaylight_api service
tags: step2
upgrade_tasks:
- name: Stop and disable opendaylight_api service
tags: step2
- service: name=opendaylight state=stopped enabled=no
+ service: name=opendaylight state=stopped enabled=no
\ No newline at end of file