x/fuel-ccp-neutron
Code Issues Proposed changes

Merge "Add option to create HA routers by default"

Browse Source
This commit is contained in:
Jenkins 2017-02-04 09:34:04 +00:00 committed by Gerrit Code Review
commit f4f30a276f
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
service/files/defaults.yaml
View File

@ -23,6 +23,7 @@ configs:
vlan_range: false vlan_range: false
logging_debug: false logging_debug: false
plugin_agent: "openvswitch" plugin_agent: "openvswitch"
l3_ha: false
ovsdb: ovsdb:
interface: "native" interface: "native"
connection: "unix:/run/openvswitch/db.sock" connection: "unix:/run/openvswitch/db.sock"

8
service/files/neutron.conf.j2
View File

@ -24,6 +24,14 @@ dhcp_agents_per_network = 2
core_plugin = {{ neutron.core_plugin }} core_plugin = {{ neutron.core_plugin }}
service_plugins = router{% if neutron.enable_lbaas %},neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2{% endif %}{% if neutron.enable_qos %},qos{% endif %} service_plugins = router{% if neutron.enable_lbaas %},neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2{% endif %}{% if neutron.enable_qos %},qos{% endif %}
# Enable HA mode for virtual routers. (boolean value)
l3_ha = {{ neutron.l3_ha }}
# If it is set to 0 then the ha router will be scheduled on every L3 agent.
max_l3_agents_per_router=0
{% if neutron.enable_lbaas %} {% if neutron.enable_lbaas %}
[service_providers] [service_providers]
service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default