Merge "Drop Sahara"

Author: Zuul

README.rst

@@ -92,7 +92,6 @@ Kolla provides images to deploy the following OpenStack projects:
 - `Neutron <https://docs.openstack.org/neutron/latest/>`__
 - `Nova <https://docs.openstack.org/nova/latest/>`__
 - `Octavia <https://docs.openstack.org/octavia/latest/>`__
-- `Sahara <https://docs.openstack.org/sahara/latest/>`__ (deprecated)
 - Skyline (`APIServer <https://docs.openstack.org/skyline-apiserver/latest/>`__ and `Console <https://docs.openstack.org/skyline-console/latest/>`__)
 - `Solum <https://docs.openstack.org/solum/latest/>`__
 - `Swift <https://docs.openstack.org/swift/latest/>`__

doc/source/matrix_aarch64.csv

@@ -48,7 +48,6 @@ placement,U,U,U
 prometheus,U,U,U
 rabbitmq,U,U,U
 redis,U,U,U
-sahara,U,U,U
 skyline,U,U,U
 solum,U,U,U
 swift,U,U,U

doc/source/matrix_x86.csv

@@ -49,7 +49,6 @@ placement,T,T,T
 prometheus,U,U,U
 rabbitmq,T,T,T
 redis,T,U,U
-sahara,U,U,U
 skyline,U,U,U
 solum,U,U,U
 swift,T,T,U

docker/horizon/extend_start.sh

@@ -155,14 +155,6 @@ function config_octavia_dashboard {
         "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1482_project_load_balancer_panel.py"
 }
 
-function config_sahara_dashboard {
-    for file in ${SITE_PACKAGES}/sahara_dashboard/enabled/_*[^__].py; do
-        config_dashboard "${ENABLE_SAHARA:-no}" \
-            "${SITE_PACKAGES}/sahara_dashboard/enabled/${file##*/}" \
-            "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
-    done
-}
-
 function config_solum_dashboard {
     for file in ${SITE_PACKAGES}/solumdashboard/local/enabled/_*[^__].py; do
         config_dashboard "${ENABLE_SOLUM:-no}" \
@@ -257,7 +249,6 @@ config_masakari_dashboard
 config_mistral_dashboard
 config_neutron_vpnaas_dashboard
 config_octavia_dashboard
-config_sahara_dashboard
 config_solum_dashboard
 config_tacker_dashboard
 config_trove_dashboard

docker/openstack-base/Dockerfile.j2

@@ -160,7 +160,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'python-novaclient',
         'python-openstackclient',
         'python-qpid-proton',
-        'python-saharaclient',
         'python-swiftclient',
         'python-troveclient',
         'python-vitrageclient',