openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix ovs/netns mounts for neutron agents 

Don't mount netns or /run from host system. If we mount /run or /run/netns then
it leads to broken netns on a host system level. Also when we remove containers
those netns bind files remain. This aslo causes problems.

Adapts I37c0783de6d6264ccf73648a1d15b23fdc31ad99 authored-by
Aleksandr Didenko <adidenko@mirantis.com>

Related-bug: #1734333

Change-Id: I462b40744610eb95031809d04b4ecce0d82a6e19
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
(cherry picked from commit 2e3a91f58b)
This commit is contained in:
Bogdan Dobrelya 2017-11-24 17:05:56 +01:00
parent d4e13a0686
commit 9c4c36b9c5
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/services/neutron-dhcp.yaml
View File

@ -102,7 +102,7 @@ outputs:
- /var/lib/kolla/config_files/neutron_dhcp.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
- /lib/modules:/lib/modules:ro
- /run/:/run
- /run/openvswitch:/run/openvswitch
- /var/lib/neutron:/var/lib/neutron
- /var/log/containers/neutron:/var/log/neutron
environment:

2
docker/services/neutron-l3.yaml
View File

@ -98,7 +98,7 @@ outputs:
- /var/lib/kolla/config_files/neutron_l3_agent.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
- /lib/modules:/lib/modules:ro
- /run:/run
- /run/openvswitch:/run/openvswitch
- /var/lib/neutron:/var/lib/neutron
- /var/log/containers/neutron:/var/log/neutron
environment:

1
docker/services/neutron-metadata.yaml
View File

@ -98,7 +98,6 @@ outputs:
- /var/lib/kolla/config_files/neutron_metadata_agent.json:/var/lib/kolla/config_files/config.json:ro
- /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:

4
docker/services/neutron-ovs-agent.yaml
View File

@ -109,7 +109,7 @@ outputs:
- /var/lib/kolla/config_files/neutron_ovs_agent.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
- /lib/modules:/lib/modules:ro
- /run:/run
- /run/openvswitch:/run/openvswitch
- /etc/puppet:/etc/puppet:ro
- /usr/share/openstack-puppet/modules/:/usr/share/openstack-puppet/modules/:ro
- /var/run/openvswitch/db.sock:/var/run/openvswitch/db.sock
@ -130,7 +130,7 @@ outputs:
- /var/lib/kolla/config_files/neutron_ovs_agent.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
- /lib/modules:/lib/modules:ro
- /run:/run
- /run/openvswitch:/run/openvswitch
- /var/log/containers/neutron:/var/log/neutron
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS