openstack
/
salt-formula-neutron
Code Issues Proposed changes

contrail lbaas for liberty and mitaka 

Change-Id: I3e30ebcf8298766ab82eea49f962affeb2d74cd1
This commit is contained in:
Jakub Pavlik 2016-09-18 23:30:04 +02:00
parent 5071cba9a9
commit b61ff0e452
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/files/liberty/neutron-server.conf.Debian
View File

@ -67,7 +67,7 @@ bind_port = {{ neutron.bind.port }}
{%- if server.backend.engine == "contrail" %}
core_plugin = neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2
api_extensions_path = extensions:/usr/lib/python2.7/dist-packages/neutron_plugin_contrail/extensions
api_extensions_path = extensions:/usr/lib/python2.7/dist-packages/neutron_plugin_contrail/extensions:/usr/lib/python2.7/dist-packages/neutron_lbaas/extensions
{%- elif server.backend.engine == "midonet" %}
core_plugin = midonet.neutron.plugin_v2.MidonetPluginV2
{%- endif %}
@ -82,8 +82,7 @@ core_plugin = midonet.neutron.plugin_v2.MidonetPluginV2
# Example: service_plugins = router,firewall,lbaas,vpnaas,metering
{%- if server.backend.engine == "contrail" %}
# JPAVLIK TEMPRORARY DISABLE LbaaS until Contrail fix it
#service_plugins = neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin
service_plugins = neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin
{%- elif server.backend.engine == "midonet" %}
service_plugins = lbaas,midonet.neutron.services.l3.l3_midonet.MidonetL3ServicePlugin,midonet.neutron.services.firewall.plugin.MidonetFirewallPlugin
{%- endif %}
@ -1061,4 +1060,4 @@ vif_types = vrouter
service_provider = LOADBALANCER:Opencontrail:neutron_plugin_contrail.plugins.opencontrail.loadbalancer.driver.OpencontrailLoadbalancerDriver:default
{%- elif server.backend.engine == "midonet" %}
service_provider = LOADBALANCER:Midonet:midonet.neutron.services.loadbalancer.driver.MidonetLoadbalancerDriver:default
{%- endif %}
{%- endif %}

7
neutron/files/liberty/neutron-server.conf.RedHat
View File

@ -67,7 +67,7 @@ bind_port = {{ neutron.bind.port }}
{%- if server.backend.engine == "contrail" %}
core_plugin = neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2
api_extensions_path = extensions:/usr/lib/python2.7/site-packages/neutron_plugin_contrail/extensions
api_extensions_path = extensions:/usr/lib/python2.7/site-packages/neutron_plugin_contrail/extensions:/usr/lib/python2.7/site-packages/neutron_lbaas/extensions
{%- elif server.backend.engine == "midonet" %}
core_plugin = midonet.neutron.plugin_v2.MidonetPluginV2
{%- endif %}
@ -82,8 +82,7 @@ core_plugin = midonet.neutron.plugin_v2.MidonetPluginV2
# Example: service_plugins = router,firewall,lbaas,vpnaas,metering
{%- if server.backend.engine == "contrail" %}
# JPAVLIK TEMPRORARY DISABLE LbaaS until Contrail fix it
#service_plugins = neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin
service_plugins = neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin
{%- elif server.backend.engine == "midonet" %}
service_plugins = lbaas,midonet.neutron.services.l3.l3_midonet.MidonetL3ServicePlugin,midonet.neutron.services.firewall.plugin.MidonetFirewallPlugin
{%- endif %}
@ -1060,4 +1059,4 @@ vif_types = vrouter
service_provider = LOADBALANCER:Opencontrail:neutron_plugin_contrail.plugins.opencontrail.loadbalancer.driver.OpencontrailLoadbalancerDriver:default
{%- elif server.backend.engine == "midonet" %}
service_provider = LOADBALANCER:Midonet:midonet.neutron.services.loadbalancer.driver.MidonetLoadbalancerDriver:default
{%- endif %}
{%- endif %}

4
neutron/files/mitaka/neutron-server.conf.Debian
View File

@ -26,7 +26,7 @@ bind_port = {{ server.bind.port }}
# neutron.extensions is appended to this, so if your extensions are in there
# you don't need to specify them here. (string value)
#api_extensions_path =
api_extensions_path = extensions:/usr/lib/python2.7/dist-packages/neutron_plugin_contrail/extensions
api_extensions_path = extensions:/usr/lib/python2.7/dist-packages/neutron_plugin_contrail/extensions:/usr/lib/python2.7/dist-packages/neutron_lbaas/extensions
# The type of authentication to use (string value)
#auth_strategy = keystone
@ -38,7 +38,7 @@ core_plugin = neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.Neutr
# The service plugins Neutron will use (list value)
#service_plugins =
service_plugins = neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin
# The base MAC address Neutron will use for VIFs. The first 3 octets will
# remain unchanged. If the 4th octet is not 00, it will also be used. The
# others will be randomly generated. (string value)