diff --git a/defaults/main.yml b/defaults/main.yml index 01897292..a1a6e173 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -314,7 +314,6 @@ horizon_enable_designate_ui: False horizon_enable_heat_ui: False ## Neutron features to enable -horizon_enable_neutron_lbaas: False horizon_enable_neutron_fwaas: False horizon_enable_neutron_vpnaas: False @@ -418,8 +417,6 @@ horizon_mistral_optional_pip_packages: - mistral-dashboard horizon_neutron_fwaas_optional_pip_packages: - neutron-fwaas-dashboard -horizon_neutron_lbaas_optional_pip_packages: - - neutron-lbaas-dashboard horizon_neutron_vpnaas_optional_pip_packages: - neutron-vpnaas-dashboard horizon_octavia_optional_pip_packages: diff --git a/releasenotes/notes/retire_lbaas-31ba162a0ee43707.yaml b/releasenotes/notes/retire_lbaas-31ba162a0ee43707.yaml new file mode 100644 index 00000000..19043e32 --- /dev/null +++ b/releasenotes/notes/retire_lbaas-31ba162a0ee43707.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - | + Variable `horizon_enable_neutron_lbaas` has been removed because of global + neutron lbaas retirement process. This means that horizon neutron-lbaas-ui + plugin won't be installed. diff --git a/tasks/horizon_install_source.yml b/tasks/horizon_install_source.yml index cb284a93..d926f280 100644 --- a/tasks/horizon_install_source.yml +++ b/tasks/horizon_install_source.yml @@ -56,7 +56,6 @@ (horizon_enable_manila_ui | bool) | ternary(horizon_manila_optional_pip_packages, []) + (horizon_enable_masakari_ui | bool) | ternary(horizon_masakari_optional_pip_packages, []) + (horizon_enable_neutron_fwaas | bool) | ternary(horizon_neutron_fwaas_optional_pip_packages, []) + - (horizon_enable_neutron_lbaas | bool) | ternary(horizon_neutron_lbaas_optional_pip_packages, []) + (horizon_enable_neutron_vpnaas | bool) | ternary(horizon_neutron_vpnaas_optional_pip_packages, []) + (horizon_enable_octavia_ui | bool) | ternary(horizon_octavia_optional_pip_packages, []) + (horizon_enable_sahara_ui | bool) | ternary(horizon_sahara_optional_pip_packages, []) + diff --git a/templates/horizon_local_settings.py.j2 b/templates/horizon_local_settings.py.j2 index c3867852..fbb19413 100644 --- a/templates/horizon_local_settings.py.j2 +++ b/templates/horizon_local_settings.py.j2 @@ -302,7 +302,6 @@ OPENSTACK_NEUTRON_NETWORK = { 'enable_quotas': True, 'enable_ipv6': {{ horizon_enable_ipv6 | bool }}, 'enable_distributed_router': False, - 'enable_lb': {{ horizon_enable_neutron_lbaas | bool }}, 'enable_vpn': {{ horizon_enable_neutron_vpnaas | bool }}, 'enable_ha_router': {{ horizon_enable_ha_router | bool }}, 'enable_fip_topology_check': True, diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 7d0232a8..6ce6f642 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -37,7 +37,6 @@ horizon_service_distro_packages: - openstack-ironic-ui - openstack-magnum-ui - openstack-manila-ui - - openstack-neutron-lbaas-ui - openstack-sahara-ui - openstack-trove-ui - openstack-octavia-ui diff --git a/vars/suse.yml b/vars/suse.yml index dc0b3f39..8f3035f9 100644 --- a/vars/suse.yml +++ b/vars/suse.yml @@ -38,7 +38,6 @@ horizon_service_distro_packages: - openstack-horizon-plugin-manila-ui - openstack-horizon-plugin-monasca-ui - openstack-horizon-plugin-neutron-fwaas-ui - - openstack-horizon-plugin-neutron-lbaas-ui - openstack-horizon-plugin-neutron-vpnaas-ui - openstack-horizon-plugin-sahara-ui - openstack-horizon-plugin-trove-ui