openstack
/
openstack-ansible-os_horizon
Code Issues Proposed changes

Remove enable_{firewall,vpn} options 

This patch removes the enable_firewall/enable_vpn options since
they were removed in Pike (deprecated since Juno). The FWaaS panel
is still enabled via the modern method (copying files into place).

The VPNaaS variable is no longer being used, so it is being removed.

Closes-Bug: 1735199
Change-Id: I7d42b2a857a7f0c9401becc68a152102fb702508
This commit is contained in:
Major Hayden 2017-11-29 09:49:14 -06:00
parent 8aef684fdd
commit a1de0aa24f
No known key found for this signature in database
GPG Key ID: 737051E0C1011FB1
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -208,7 +208,6 @@ horizon_enable_designate_ui: 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

2
templates/horizon_local_settings.py.j2
View File

@ -282,8 +282,6 @@ OPENSTACK_NEUTRON_NETWORK = {
'enable_distributed_router': False,
'enable_lb': {{ horizon_enable_neutron_lbaas | bool }},
'enable_ha_router': {{ horizon_enable_ha_router | bool }},
'enable_firewall': {{ horizon_enable_neutron_fwaas | bool }},
'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