Merge "Add option to enable from VPNaaS in Horizon"

This commit is contained in:
Jenkins 2016-04-14 14:29:06 +00:00 committed by Gerrit Code Review
commit 22bc216771
2 changed files with 2 additions and 1 deletions

View File

@ -144,6 +144,7 @@ horizon_launch_instance_ng: False
## Neutron features to enable
horizon_enable_neutron_lbaas: False
horizon_enable_neutron_fwaas: False
horizon_enable_neutron_vpnaas: False
## Swift
horizon_swift_file_transfer_chunk_size: 524288

View File

@ -271,7 +271,7 @@ OPENSTACK_NEUTRON_NETWORK = {
'enable_ha_router': False,
'enable_lb': {{ horizon_enable_neutron_lbaas | bool }},
'enable_firewall': {{ horizon_enable_neutron_fwaas | bool }},
'enable_vpn': False,
'enable_vpn': {{ horizon_enable_neutron_vpnaas | bool }},
'enable_fip_topology_check': True,
# Neutron can be configured with a default Subnet Pool to be used for IPv4