openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Use full path for metering_agent interface_Driver

Browse Source 
Metering agent has not been updated to resolve stevedore aliases for
drivers so the full module.path string must be used instead.

Change-Id: I2f0991fc0ab14fa7ccdd677437c2cf2a5ba78377
Closes-Bug: #1656278
This commit is contained in:
Hugh Saunders 2017-01-13 11:56:30 +00:00
parent 78bbecd779
commit 6aaf1e7fd7
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
defaults/main.yml
View File

@ -229,6 +229,14 @@ neutron_services:
config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/metering_agent.ini --log-file=/var/log/neutron/neutron-metering-agent.log"
config_overrides: "{{ neutron_metering_agent_ini_overrides }}"
config_type: "ini"
# 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.agent.linux.interface.BridgeInterfaceDriver
neutron-l3-agent:
group: neutron_l3_agent
service_name: neutron-l3-agent

10
templates/metering_agent.ini.j2
View File

@ -6,7 +6,15 @@ debug = {{ debug }}
# Drivers
driver = {{ neutron_driver_metering }}
interface_driver = {{ neutron_plugins[neutron_plugin_type].driver_interface }}
# 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 }}
# Intervals
measure_interval = 30