Fix stevedore warnings

As a result of https://review.openstack.org/#/c/234991/ Stevedore
aliases were added for interface_drivers, this generates warning
messages in the dhcp_agent log file.

This can be fixed by setting the values for interface_driver to the
correct stevedore alias.

Change-Id: Ia7bb2a454af8e52731afe631a981bb31400f0e8f
This commit is contained in:
Andy McCrae 2016-11-17 12:25:22 +00:00
parent e7bcb312a8
commit 08e84191e0

View File

@ -132,41 +132,41 @@ neutron_plugin_type: ml2.lxb
neutron_plugins: neutron_plugins:
ml2.lxb: ml2.lxb:
driver_firewall: neutron.agent.linux.iptables_firewall.IptablesFirewallDriver driver_firewall: iptables
driver_interface: neutron.agent.linux.interface.BridgeInterfaceDriver driver_interface: linuxbridge
drivers_type: "{{ neutron_ml2_drivers_type }}" drivers_type: "{{ neutron_ml2_drivers_type }}"
l2_population: "{{ neutron_l2_population }}" l2_population: "{{ neutron_l2_population }}"
mechanisms: "linuxbridge{% if neutron_l2_population | bool %},l2population{% endif %}" mechanisms: "linuxbridge{% if neutron_l2_population | bool %},l2population{% endif %}"
l3_agent_mode: "legacy" l3_agent_mode: "legacy"
plugin_conf_ini_overrides: "{{ neutron_ml2_conf_ini_overrides }}" plugin_conf_ini_overrides: "{{ neutron_ml2_conf_ini_overrides }}"
plugin_core: neutron.plugins.ml2.plugin.Ml2Plugin plugin_core: ml2
plugin_ini: plugins/ml2/ml2_conf.ini plugin_ini: plugins/ml2/ml2_conf.ini
ml2.ovs: ml2.ovs:
driver_firewall: neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver driver_firewall: iptables_hybrid
driver_interface: neutron.agent.linux.interface.OVSInterfaceDriver driver_interface: openvswitch
drivers_type: "{{ neutron_ml2_drivers_type }}" drivers_type: "{{ neutron_ml2_drivers_type }}"
l2_population: "{{ neutron_l2_population }}" l2_population: "{{ neutron_l2_population }}"
mechanisms: "openvswitch{% if neutron_l2_population | bool %},l2population{% endif %}" mechanisms: "openvswitch{% if neutron_l2_population | bool %},l2population{% endif %}"
l3_agent_mode: "legacy" l3_agent_mode: "legacy"
plugin_conf_ini_overrides: "{{ neutron_ml2_conf_ini_overrides }}" plugin_conf_ini_overrides: "{{ neutron_ml2_conf_ini_overrides }}"
plugin_core: neutron.plugins.ml2.plugin.Ml2Plugin plugin_core: ml2
plugin_ini: plugins/ml2/ml2_conf.ini plugin_ini: plugins/ml2/ml2_conf.ini
ml2.ovs.dvr: ml2.ovs.dvr:
driver_firewall: neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver driver_firewall: iptables_hybrid
driver_interface: neutron.agent.linux.interface.OVSInterfaceDriver driver_interface: openvswitch
drivers_type: "{{ neutron_ml2_drivers_type }}" drivers_type: "{{ neutron_ml2_drivers_type }}"
l2_population: "{{ neutron_l2_population }}" l2_population: "{{ neutron_l2_population }}"
mechanisms: "openvswitch{% if neutron_l2_population | bool %},l2population{% endif %}" mechanisms: "openvswitch{% if neutron_l2_population | bool %},l2population{% endif %}"
l3_agent_mode: "{% if 'nova_compute' in group_names %}dvr{% else %}dvr_snat{% endif %}" l3_agent_mode: "{% if 'nova_compute' in group_names %}dvr{% else %}dvr_snat{% endif %}"
router_distributed: True router_distributed: True
plugin_conf_ini_overrides: "{{ neutron_ml2_conf_ini_overrides }}" plugin_conf_ini_overrides: "{{ neutron_ml2_conf_ini_overrides }}"
plugin_core: neutron.plugins.ml2.plugin.Ml2Plugin plugin_core: ml2
plugin_ini: plugins/ml2/ml2_conf.ini plugin_ini: plugins/ml2/ml2_conf.ini
ml2.calico: ml2.calico:
drivers_type: "flat, local" drivers_type: "flat, local"
mechanisms: "calico" mechanisms: "calico"
plugin_conf_ini_overrides: "{{ neutron_ml2_conf_ini_overrides }}" plugin_conf_ini_overrides: "{{ neutron_ml2_conf_ini_overrides }}"
plugin_core: neutron.plugins.ml2.plugin.Ml2Plugin plugin_core: ml2
plugin_ini: plugins/ml2/ml2_conf.ini plugin_ini: plugins/ml2/ml2_conf.ini
plumgrid: plumgrid:
plugin_conf_ini_overrides: "{{ neutron_plumgrid_conf_ini_overrides }}" plugin_conf_ini_overrides: "{{ neutron_plumgrid_conf_ini_overrides }}"