[USSURI ONLY] Remove duplicate /var/run/openvswitch bind mount

This duplicate bindmount is causing namespaces to leak.
Fixes BZ# 1903091

Partially cherry picked from
Change-Id: Iaced2ba676a4e4f651c67da082797cc1c1ffccd1

Change-Id: I230dc58d401e8feb1e38cc8bad276690d141ce73
This commit is contained in:
Matthew N Heler 2021-01-15 17:28:56 -06:00 committed by Matthew Heler
parent 47829fffb7
commit 0f3cc2653c
1 changed files with 2 additions and 3 deletions

View File

@ -251,8 +251,8 @@ outputs:
tripleo.collectd.plugins.neutron_ovs_agent:
- ovs_events
- ovs_stats
collectd::plugin::ovs_events::socket: '/var/run/openvswitch/db.sock'
collectd::plugin::ovs_stats::socket: '/var/run/openvswitch/db.sock'
collectd::plugin::ovs_events::socket: '/run/openvswitch/db.sock'
collectd::plugin::ovs_stats::socket: '/run/openvswitch/db.sock'
puppet_config:
config_volume: neutron
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
@ -319,7 +319,6 @@ outputs:
- /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
- /lib/modules:/lib/modules:ro
- /run/openvswitch:/run/openvswitch:shared,z
- /var/run/openvswitch/:/var/run/openvswitch/:shared,z
-
if:
- docker_puppet_mount_host