openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "[USSURI ONLY] Remove duplicate /var/run/openvswitch bind mount" into stable/ussuri

This commit is contained in:
Zuul 2021-01-20 23:18:39 +00:00 committed by Gerrit Code Review
parent 4f90cf4a75 0f3cc2653c
commit b96293fc80
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/neutron/neutron-ovs-agent-container-puppet.yaml
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