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>
This commit is contained in:
parent
7984be92db
commit
2e3a91f58b
|
@ -107,7 +107,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
|
||||
environment:
|
||||
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
||||
|
|
|
@ -105,7 +105,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
|
||||
environment:
|
||||
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
||||
|
|
|
@ -105,7 +105,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
|
||||
environment:
|
||||
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
||||
|
|
|
@ -114,7 +114,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
|
||||
|
@ -137,7 +137,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
|
||||
environment:
|
||||
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
||||
host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]}
|
||||
|
|
Loading…
Reference in New Issue