From 3a0f43cd065530a40a4fa90b6d21541d1241c425 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Sat, 18 May 2024 17:39:16 +0200 Subject: [PATCH] Remove sahara and murano UI installation Sahara and Murano projects were retired, so it's UI package was never released for C Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/919994 Change-Id: I90a4464ad8f652603ae0a4fff4ea26ba4a7f044e --- defaults/main.yml | 14 -------------- tasks/horizon_install_source.yml | 2 -- vars/main.yml | 8 -------- vars/redhat.yml | 1 - 4 files changed, 25 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 4ccb3060..66656c84 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -79,10 +79,6 @@ masakari_dashboard_git_install_branch: "{{ horizon_git_track_branch }}" mistral_dashboard_git_repo: https://opendev.org/openstack/mistral-dashboard.git mistral_dashboard_git_install_branch: "{{ horizon_git_track_branch }}" -## The git source/branch for the Murano UI plugin -murano_dashboard_git_repo: https://opendev.org/openstack/murano-dashboard -murano_dashboard_git_install_branch: "{{ horizon_git_track_branch }}" - ## The git source/branch for the Octavia UI plugin octavia_dashboard_git_repo: https://opendev.org/openstack/octavia-dashboard octavia_dashboard_git_install_branch: "{{ horizon_git_track_branch }}" @@ -345,9 +341,6 @@ horizon_enable_manila_ui: "{{ (groups['manila_all'] is defined) and (groups['man ## Mistral Ui Panel horizon_enable_mistral_ui: "{{ (groups['mistral_all'] is defined) and (groups['mistral_all'] | length > 0) }}" -## Murano UI Panel -horizon_enable_murano_ui: "{{ (groups['murano_all'] is defined) and (groups['murano_all'] | length > 0) }}" - ## Neutron features to enable horizon_enable_neutron_vpnaas: >- {{ neutron_plugin_base is defined and ('vpnaas' in neutron_plugin_base or 'ovn-vpnaas' in neutron_plugin_base) }} @@ -355,9 +348,6 @@ horizon_enable_neutron_vpnaas: >- ## Octavia UI Panel horizon_enable_octavia_ui: "{{ (groups['octavia_all'] is defined) and (groups['octavia_all'] | length > 0) }}" -## Sahara UI Panel -horizon_enable_sahara_ui: "{{ (groups['sahara_all'] is defined) and (groups['sahara_all'] | length > 0) }}" - ## Tacker UI Panel horizon_enable_tacker_ui: "{{ (groups['tacker_all'] is defined) and (groups['tacker_all'] | length > 0) }}" @@ -474,14 +464,10 @@ horizon_masakari_optional_pip_packages: - "git+{{ masakari_dashboard_git_repo }}@{{ masakari_dashboard_git_install_branch }}#egg=masakari_dashboard" horizon_mistral_optional_pip_packages: - "git+{{ mistral_dashboard_git_repo }}@{{ mistral_dashboard_git_install_branch }}#egg=mistral-dashboard" -horizon_murano_optional_pip_packages: - - "git+{{ murano_dashboard_git_repo }}@{{ murano_dashboard_git_install_branch }}#egg=murano-dashboard" horizon_neutron_vpnaas_optional_pip_packages: - "git+{{ neutron_vpnaas_dashboard_git_repo }}@{{ neutron_vpnaas_dashboard_git_install_branch }}#egg=neutron_vpnaas_dashboard" horizon_octavia_optional_pip_packages: - "git+{{ octavia_dashboard_git_repo }}@{{ octavia_dashboard_git_install_branch }}#egg=octavia_dashboard" -horizon_sahara_optional_pip_packages: - - sahara_dashboard horizon_tacker_optional_pip_packages: - "git+{{ tacker_dashboard_git_repo }}@{{ tacker_dashboard_git_install_branch }}#egg=tacker_horizon" horizon_trove_optional_pip_packages: diff --git a/tasks/horizon_install_source.yml b/tasks/horizon_install_source.yml index 81b4bd10..9dc5a517 100644 --- a/tasks/horizon_install_source.yml +++ b/tasks/horizon_install_source.yml @@ -48,10 +48,8 @@ (horizon_enable_mistral_ui | bool) | ternary(horizon_mistral_optional_pip_packages, []) + (horizon_enable_manila_ui | bool) | ternary(horizon_manila_optional_pip_packages, []) + (horizon_enable_masakari_ui | bool) | ternary(horizon_masakari_optional_pip_packages, []) + - (horizon_enable_murano_ui | bool) | ternary(horizon_murano_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, []) + (horizon_enable_tacker_ui | bool) | ternary(horizon_tacker_optional_pip_packages, []) + (horizon_enable_trove_ui | bool) | ternary(horizon_trove_optional_pip_packages, []) + (horizon_enable_watcher_ui | bool) | ternary(horizon_watcher_optional_pip_packages, []) + diff --git a/vars/main.yml b/vars/main.yml index 5c09c1f7..570e1729 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -25,10 +25,6 @@ _horizon_translations_pull: branch: "{{ horizon_translations_project_version }}" enabled: True module: designatedashboard - - project: "sahara-dashboard" - branch: "{{ horizon_translations_project_version }}" - enabled: True - module: sahara_dashboard - project: "heat-dashboard" branch: "{{ horizon_translations_project_version }}" enabled: "{{ horizon_enable_heat_ui }}" @@ -37,10 +33,6 @@ _horizon_translations_pull: branch: "{{ horizon_translations_project_version }}" enabled: True module: magnum_ui - - project: "murano-dashboard" - branch: "{{ horizon_translations_project_version }}" - enabled: True - module: murano_dashboard - project: "trove-dashboard" branch: "{{ horizon_translations_project_version }}" enabled: True diff --git a/vars/redhat.yml b/vars/redhat.yml index 6d6d9bde..c40177a2 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -40,7 +40,6 @@ horizon_service_distro_packages: - openstack-ironic-ui - openstack-magnum-ui - openstack-manila-ui - - openstack-sahara-ui - openstack-trove-ui - openstack-octavia-ui - python3-django-horizon