From a1de0aa24f56f4ba30c86c26cc14857f391ba3c7 Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Wed, 29 Nov 2017 09:49:14 -0600 Subject: [PATCH] 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 --- defaults/main.yml | 1 - templates/horizon_local_settings.py.j2 | 2 -- 2 files changed, 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 342fea56..02908f0f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 diff --git a/templates/horizon_local_settings.py.j2 b/templates/horizon_local_settings.py.j2 index 5f193b75..6d91f41f 100644 --- a/templates/horizon_local_settings.py.j2 +++ b/templates/horizon_local_settings.py.j2 @@ -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