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
Containerize Sahara
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
neutron-ovs-agent.yaml
diff --git
a/docker/services/neutron-ovs-agent.yaml
b/docker/services/neutron-ovs-agent.yaml
index
89bf866
..
65ad21e
100644
(file)
--- a/
docker/services/neutron-ovs-agent.yaml
+++ b/
docker/services/neutron-ovs-agent.yaml
@@
-70,7
+70,7
@@
outputs:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
kolla_config:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
kolla_config:
- /var/lib/kolla/config_files/neutron
-openvswitch-
agent.json:
+ /var/lib/kolla/config_files/neutron
_ovs_
agent.json:
command: /usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
permissions:
- path: /var/log/neutron
command: /usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
permissions:
- path: /var/log/neutron
@@
-78,7
+78,7
@@
outputs:
recurse: true
docker_config:
step_4:
recurse: true
docker_config:
step_4:
- neutron
ovs
agent:
+ neutron
_ovs_
agent:
image: &neutron_ovs_agent_image
list_join:
- '/'
image: &neutron_ovs_agent_image
list_join:
- '/'
@@
-91,7
+91,7
@@
outputs:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- - /var/lib/kolla/config_files/neutron
-openvswitch-
agent.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/kolla/config_files/neutron
_ovs_
agent.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
- /lib/modules:/lib/modules:ro
- /run:/run
- /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
- /lib/modules:/lib/modules:ro
- /run:/run