Updated neutron plugin_base setup and config(s)
The change modifies the "neutron_plugin_base" to use the simple names as released in OpenStack Liberty. This specifically splits the plugin base changes from the feature changes added in https://review.openstack.org/#/c/287913/2 - that review will be updated and rebased on top of this one. Change-Id: I32ff704f51b472e422be8c39a4534b1c13e43bf3
This commit is contained in:
parent
106b6ff9a3
commit
86cb1993b1
@ -97,13 +97,16 @@ neutron_rabbitmq_vhost: /neutron
|
|||||||
neutron_plugin_core: "{{ neutron_plugins[neutron_plugin_type].plugin_core }}"
|
neutron_plugin_core: "{{ neutron_plugins[neutron_plugin_type].plugin_core }}"
|
||||||
# Other plugins can be added to the system by simply extending the list `neutron_plugin_base`.
|
# Other plugins can be added to the system by simply extending the list `neutron_plugin_base`.
|
||||||
# neutron_plugin_base:
|
# neutron_plugin_base:
|
||||||
# - neutron.services.l3_router.l3_router_plugin.L3RouterPlugin
|
# - router
|
||||||
# - neutron.services.metering.metering_plugin.MeteringPlugin
|
# - firewall
|
||||||
# - neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2
|
# - lbaas
|
||||||
# - neutron.services.vpn.plugin.VPNDriverPlugin
|
# - lbaasv2
|
||||||
|
# - vpnaas
|
||||||
|
# - metering
|
||||||
|
# - qos
|
||||||
neutron_plugin_base:
|
neutron_plugin_base:
|
||||||
- neutron.services.l3_router.l3_router_plugin.L3RouterPlugin
|
- router
|
||||||
- neutron.services.metering.metering_plugin.MeteringPlugin
|
- metering
|
||||||
neutron_plugin_loaded_base: "{% for plugin in neutron_plugin_base %}{{ plugin }}{% if not loop.last %},{% endif %}{% endfor %}"
|
neutron_plugin_loaded_base: "{% for plugin in neutron_plugin_base %}{{ plugin }}{% if not loop.last %},{% endif %}{% endfor %}"
|
||||||
|
|
||||||
# Neutron Plugins
|
# Neutron Plugins
|
||||||
@ -199,18 +202,21 @@ neutron_services:
|
|||||||
# See documentation section titled "Configuring the Network Load Balacing
|
# See documentation section titled "Configuring the Network Load Balacing
|
||||||
# Service (Optional)" for more details.
|
# Service (Optional)" for more details.
|
||||||
#
|
#
|
||||||
# To enable LBaaS v1, add LoadBalancerPlugin to neutron_plugin_base list.
|
# To enable LBaaS v1, add 'lbaas' to neutron_plugin_base list.
|
||||||
# To enable LBaaS v2, add LoadBalancerPluginv2 to neutron_plugin_base list
|
# To enable LBaaS v2, add 'lbaasv2' to neutron_plugin_base list
|
||||||
neutron_lbaas: "{% if 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPlugin' in neutron_plugin_base %}True{% else %}False{% endif %}"
|
# TODO(odyssey4me): Remove the classpath from this conditional in the Newton cycle.
|
||||||
neutron_lbaasv2: "{% if 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2' in neutron_plugin_base %}True{% else %}False{% endif %}"
|
neutron_lbaas: "{% if 'lbaas' in neutron_plugin_base or 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPlugin' in neutron_plugin_base %}True{% else %}False{% endif %}"
|
||||||
|
neutron_lbaasv2: "{% if 'lbaasv2' in neutron_plugin_base or 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2' in neutron_plugin_base %}True{% else %}False{% endif %}"
|
||||||
|
|
||||||
## Neutron L3
|
## Neutron L3
|
||||||
## Please add the L3RouterPlugin to the neutron_plugin_base list
|
## Please add 'router' to the neutron_plugin_base list
|
||||||
neutron_l3: "{% if 'neutron.services.l3_router.l3_router_plugin.L3RouterPlugin' in neutron_plugin_base %}True{% else %}False{% endif %}"
|
#TODO(odyssey4me): Remove the class path from this conditional in the Newton cycle
|
||||||
|
neutron_l3: "{% if 'router' in neutron_plugin_base or 'neutron.services.l3_router.l3_router_plugin.L3RouterPlugin' in neutron_plugin_base %}True{% else %}False{% endif %}"
|
||||||
|
|
||||||
## Neutron Metering
|
## Neutron Metering
|
||||||
# Please add the MeteringPlugin to the neutron_plugin_base list
|
# Please add 'metering' to the neutron_plugin_base list
|
||||||
neutron_metering: "{% if 'neutron.services.metering.metering_plugin.MeteringPlugin' in neutron_plugin_base %}True{% else %}False{% endif %}"
|
#TODO(odyssey4me): Remove the class path from this conditional in the Newton cycle
|
||||||
|
neutron_metering: "{% if 'metering' in neutron_plugin_base or 'neutron.services.metering.metering_plugin.MeteringPlugin' in neutron_plugin_base %}True{% else %}False{% endif %}"
|
||||||
|
|
||||||
## Drivers
|
## Drivers
|
||||||
neutron_driver_network_scheduler: neutron.scheduler.dhcp_agent_scheduler.WeightScheduler
|
neutron_driver_network_scheduler: neutron.scheduler.dhcp_agent_scheduler.WeightScheduler
|
||||||
|
@ -0,0 +1,11 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- The ``neutron_plugin_base`` variable has been modifed to use the friendly
|
||||||
|
names. Deployers should change any customisations to this variable to
|
||||||
|
ensure that the customisation makes use of the short names instead of
|
||||||
|
the full class path.
|
||||||
|
- Database migration tasks have been added for the LBaaS neutron plugin.
|
||||||
|
deprecations:
|
||||||
|
- The old class path names used within the ``neutron_plugin_base``
|
||||||
|
have been deprecated in favor of the friendly names. Support for the use
|
||||||
|
of the class path plugins will be removed in the OpenStack Newton cycle.
|
Loading…
x
Reference in New Issue
Block a user