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

…" into stable/ussuri
openstack-archive · Jan 20, 2021 · b96293f · b96293f
2 parents 4f90cf4 + 0f3cc26
commit b96293f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
@@ -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