openstack
/
openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Update metering agent to use interface_driver alias"

This commit is contained in:
Zuul 2021-11-22 20:07:26 +00:00 committed by Gerrit Code Review
parent 5f4a50996c bb1ca2e87c
commit 035357d0b8
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/metering_agent.ini.j2
View File

@ -6,15 +6,7 @@ debug = {{ debug }}
# Drivers
driver = {{ neutron_driver_metering }}
# Other agents will use neutron_plugins[neutron_plugin_type].driver_interface
# for the interface_driver, but that uses a stevedore alias. Metering agent
# hasn't been updated to use stevedore alises so that fails. To work around
# the problem until metering agent is updated, we should use the full
# module.class path to the interface driver.
# TODO(hughsaunders): switch back to stevedore when
# https://review.openstack.org/#/c/419881/ merges and is backported.
interface_driver = {{ neutron_services['neutron-metering-agent'].interface_driver }}
interface_driver = {{ neutron_plugins[neutron_plugin_type].driver_interface }}
# Intervals
measure_interval = 30

1
vars/main.yml
View File

@ -417,7 +417,6 @@ neutron_services:
config_overrides: "{{ neutron_metering_agent_ini_overrides }}"
config_type: "ini"
init_config_overrides: "{{ neutron_metering_agent_init_overrides }}"
interface_driver: "{{ (neutron_plugin_type == 'ml2.lxb') | ternary('linuxbridge', 'openvswitch') }}"
start_order: 3
neutron-l3-agent:
group: neutron_l3_agent