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
/
neutron-l3.yaml
diff --git
a/docker/services/neutron-l3.yaml
b/docker/services/neutron-l3.yaml
index
c3a4d27
..
09232c2
100644
(file)
--- a/
docker/services/neutron-l3.yaml
+++ b/
docker/services/neutron-l3.yaml
@@
-58,6
+58,8
@@
outputs:
value:
service_name: {get_attr: [NeutronL3Base, role_data, service_name]}
config_settings: {get_attr: [NeutronL3Base, role_data, config_settings]}
value:
service_name: {get_attr: [NeutronL3Base, role_data, service_name]}
config_settings: {get_attr: [NeutronL3Base, role_data, config_settings]}
+ logging_source: {get_attr: [NeutronL3Base, role_data, logging_source]}
+ logging_groups: {get_attr: [NeutronL3Base, role_data, logging_groups]}
step_config: &step_config
get_attr: [NeutronL3Base, role_data, step_config]
puppet_config:
step_config: &step_config
get_attr: [NeutronL3Base, role_data, step_config]
puppet_config:
@@
-77,6
+79,9
@@
outputs:
- path: /var/log/neutron
owner: neutron:neutron
recurse: true
- path: /var/log/neutron
owner: neutron:neutron
recurse: true
+ - path: /var/lib/neutron
+ owner: neutron:neutron
+ recurse: true
docker_config:
step_4:
neutron_l3_agent:
docker_config:
step_4:
neutron_l3_agent:
@@
-93,10
+98,15
@@
outputs:
- /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
- /lib/modules:/lib/modules:ro
- /run:/run
- /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
- /lib/modules:/lib/modules:ro
- /run:/run
+ - /var/lib/neutron:/var/lib/neutron
- /var/log/containers/neutron:/var/log/neutron
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks:
- /var/log/containers/neutron:/var/log/neutron
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks:
+ - name: create /var/lib/neutron
+ file:
+ path: /var/lib/neutron
+ state: directory
- name: create persistent logs directory
file:
path: /var/log/containers/neutron
- name: create persistent logs directory
file:
path: /var/log/containers/neutron