From 6cd87c5598a6ac0057332087a054da29dd2ae19e Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 20 Nov 2024 14:02:16 +0000 Subject: [PATCH] Add FWaaS dashboard. The firewall-as-a-service project is active again in neutron so re-enable deployment of the FWaaS dashboard. Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/935798 Change-Id: Ie4eef5f397baca75bcf282e736373deececd6e9d --- defaults/main.yml | 9 +++++++++ releasenotes/notes/fwaas-dashboard-4bc47b7c284dad68.yaml | 6 ++++++ tasks/horizon_install_source.yml | 1 + 3 files changed, 16 insertions(+) create mode 100644 releasenotes/notes/fwaas-dashboard-4bc47b7c284dad68.yaml diff --git a/defaults/main.yml b/defaults/main.yml index cf576e6d..7d156936 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -115,6 +115,10 @@ zun_dashboard_git_install_branch: "{{ horizon_git_track_branch }}" neutron_vpnaas_dashboard_git_repo: https://opendev.org/openstack/neutron-vpnaas-dashboard neutron_vpnaas_dashboard_git_install_branch: "{{ horizon_git_track_branch }}" +# The git source/branch for the Neutron FWaaS UI plugin +neutron_fwaas_dashboard_git_repo: https://opendev.org/openstack/neutron-fwaas-dashboard +neutron_fwaas_dashboard_git_install_branch: "{{ horizon_git_track_branch }}" + ## The packages to build from source horizon_git_constraints: - --constraint {{ horizon_upper_constraints_url }} @@ -346,6 +350,9 @@ horizon_enable_mistral_ui: "{{ (groups['mistral_all'] is defined) and (groups['m horizon_enable_neutron_vpnaas: >- {{ neutron_plugin_base is defined and ('vpnaas' in neutron_plugin_base or 'ovn-vpnaas' in neutron_plugin_base) }} +horizon_enable_neutron_fwaas: >- + {{ neutron_plugin_base is defined and ('firewall_v2' in neutron_plugin_base) }} + ## Octavia UI Panel horizon_enable_octavia_ui: "{{ (groups['octavia_all'] is defined) and (groups['octavia_all'] | length > 0) }}" @@ -467,6 +474,8 @@ horizon_mistral_optional_pip_packages: - "git+{{ mistral_dashboard_git_repo }}@{{ mistral_dashboard_git_install_branch }}#egg=mistral-dashboard" horizon_neutron_vpnaas_optional_pip_packages: - "git+{{ neutron_vpnaas_dashboard_git_repo }}@{{ neutron_vpnaas_dashboard_git_install_branch }}#egg=neutron_vpnaas_dashboard" +horizon_neutron_fwaas_optional_pip_packages: + - "git+{{ neutron_fwaas_dashboard_git_repo }}@{{ neutron_fwaas_dashboard_git_install_branch }}#egg=neutron_fwaas_dashboard" horizon_octavia_optional_pip_packages: - "git+{{ octavia_dashboard_git_repo }}@{{ octavia_dashboard_git_install_branch }}#egg=octavia_dashboard" horizon_tacker_optional_pip_packages: diff --git a/releasenotes/notes/fwaas-dashboard-4bc47b7c284dad68.yaml b/releasenotes/notes/fwaas-dashboard-4bc47b7c284dad68.yaml new file mode 100644 index 00000000..e61c3df7 --- /dev/null +++ b/releasenotes/notes/fwaas-dashboard-4bc47b7c284dad68.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + The neutron firewall-as-a-servie dashboard will be automatically deployed + if the FWaaS service is enabled. FWaaS is now an active deliverable again + fron the Neutron project. diff --git a/tasks/horizon_install_source.yml b/tasks/horizon_install_source.yml index 9dc5a517..1d918159 100644 --- a/tasks/horizon_install_source.yml +++ b/tasks/horizon_install_source.yml @@ -49,6 +49,7 @@ (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_vpnaas | bool) | ternary(horizon_neutron_vpnaas_optional_pip_packages, []) + + (horizon_enable_neutron_fwaas | bool) | ternary(horizon_neutron_fwaas_optional_pip_packages, []) + (horizon_enable_octavia_ui | bool) | ternary(horizon_octavia_optional_pip_packages, []) + (horizon_enable_tacker_ui | bool) | ternary(horizon_tacker_optional_pip_packages, []) + (horizon_enable_trove_ui | bool) | ternary(horizon_trove_optional_pip_packages, []) +