Merge "Drop Sahara"

16 files changed, 5 insertions, 150 deletions

diff --git a/README.rst b/README.rst
index 947bce6e1..281f433d4 100644
--- a/README.rst
+++ b/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/>`__
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index bf52a0910..abb899e3e 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/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
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index a0aea2dda..612b6c925 100644
--- a/doc/source/matrix_x86.csv
+++ b/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
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index 8115556e8..a9bce11b6 100644
--- a/docker/horizon/extend_start.sh
+++ b/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
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 2bfa3a0c6..7ca946102 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/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',
diff --git a/docker/sahara/sahara-api/Dockerfile.j2 b/docker/sahara/sahara-api/Dockerfile.j2
deleted file mode 100644
index 585934ff2..000000000
--- a/docker/sahara/sahara-api/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}sahara-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block sahara_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-COPY extend_start.sh /usr/local/bin/kolla_sahara_extend_start
-RUN chmod 644 /usr/local/bin/kolla_sahara_extend_start
-
-{% block sahara_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER sahara
diff --git a/docker/sahara/sahara-api/extend_start.sh b/docker/sahara/sahara-api/extend_start.sh
deleted file mode 100644
index 8054dd698..000000000
--- a/docker/sahara/sahara-api/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head
-    exit 0
-fi
diff --git a/docker/sahara/sahara-base/Dockerfile.j2 b/docker/sahara/sahara-base/Dockerfile.j2
deleted file mode 100644
index 713795444..000000000
--- a/docker/sahara/sahara-base/Dockerfile.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block sahara_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='sahara') }}
-
-{% if base_package_type == 'rpm' %}
-    {% set sahara_base_packages = ['openssh'] %}
-{% elif base_package_type == 'deb' %}
-    {% set sahara_base_packages = ['openssh-client'] %}
-{% endif %}
-{{ macros.install_packages(sahara_base_packages | customizable("packages")) }}
-
-ADD sahara-base-archive /sahara-base-source
-ADD plugins-archive /
-
-{% set sahara_base_pip_packages = [
-    '/sahara'
-] %}
-{% set sahara_base_plugins_pip_packages = [
-    '/plugins/*',
-] %}
-
-COPY sahara_sudoers /etc/sudoers.d/kolla_sahara_sudoers
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN ln -s sahara-base-source/* sahara \
-    && {{ macros.install_pip(sahara_base_pip_packages | customizable("pip_packages")) }} \
-    && if [ "$(ls /plugins)" ]; then \
-        {{ macros.install_pip(sahara_base_plugins_pip_packages) }}; \
-    fi \
-    && mkdir -p /etc/sahara \
-    && cp -r /sahara/etc/sahara/* /etc/sahara/ \
-    && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/sahara/rootwrap.conf \
-    && chmod 750 /etc/sudoers.d \
-    && chmod 640 /etc/sudoers.d/kolla_sahara_sudoers \
-    && touch /usr/local/bin/kolla_sahara_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_sahara_extend_start
-
-{% block sahara_base_footer %}{% endblock %}
diff --git a/docker/sahara/sahara-base/extend_start.sh b/docker/sahara/sahara-base/extend_start.sh
deleted file mode 100644
index 8245204d5..000000000
--- a/docker/sahara/sahara-base/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/sahara" ]]; then
-    mkdir -p /var/log/kolla/sahara
-fi
-if [[ $(stat -c %a /var/log/kolla/sahara) != "755" ]]; then
-    chmod 755 /var/log/kolla/sahara
-fi
-
-. /usr/local/bin/kolla_sahara_extend_start
diff --git a/docker/sahara/sahara-base/sahara_sudoers b/docker/sahara/sahara-base/sahara_sudoers
deleted file mode 100644
index bd8bfeebd..000000000
--- a/docker/sahara/sahara-base/sahara_sudoers
+++ /dev/null
@@ -1 +0,0 @@
-%kolla ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/sahara-rootwrap /etc/sahara/rootwrap.conf *
diff --git a/docker/sahara/sahara-engine/Dockerfile.j2 b/docker/sahara/sahara-engine/Dockerfile.j2
deleted file mode 100644
index 9063e909d..000000000
--- a/docker/sahara/sahara-engine/Dockerfile.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}sahara-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block sahara_engine_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-    {% set sahara_engine_packages = ['nc'] %}
-{% elif base_package_type == 'deb' %}
-    {% set sahara_engine_packages = ['netcat-openbsd'] %}
-{% endif %}
-
-{{ macros.install_packages(sahara_engine_packages | customizable("packages")) }}
-
-{% block sahara_engine_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER sahara
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 21979997b..9c2e2efd3 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -102,7 +102,6 @@ _PROFILE_OPTS = [
                     'mistral',
                     'octavia',
                     'redis',
-                    'sahara',
                     'solum',
                     'tacker',
                     'telegraf',
diff --git a/kolla/common/sources.py b/kolla/common/sources.py
index ab2a9d40b..6f8e03273 100644
--- a/kolla/common/sources.py
+++ b/kolla/common/sources.py
@@ -139,10 +139,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/octavia-dashboard/'
                      'octavia-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-sahara-dashboard': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara-dashboard/'
-                     'sahara-dashboard-${openstack_branch}.tar.gz')},
     'horizon-plugin-solum-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/solum-dashboard/'
@@ -416,34 +412,6 @@ SOURCES = {
                      'releases/download/v${version}/'
                      'prometheus'
                      '-${version}.linux-${debian_arch}.tar.gz')},
-    'sahara-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara/'
-                     'sahara-${openstack_branch}.tar.gz')},
-    'sahara-base-plugin-ambari': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara-plugin-ambari/'
-                     'sahara-plugin-ambari-${openstack_branch}.tar.gz')},
-    'sahara-base-plugin-cdh': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara-plugin-cdh/'
-                     'sahara-plugin-cdh-${openstack_branch}.tar.gz')},
-    'sahara-base-plugin-mapr': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara-plugin-mapr/'
-                     'sahara-plugin-mapr-${openstack_branch}.tar.gz')},
-    'sahara-base-plugin-spark': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara-plugin-spark/'
-                     'sahara-plugin-spark-${openstack_branch}.tar.gz')},
-    'sahara-base-plugin-storm': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara-plugin-storm/'
-                     'sahara-plugin-storm-${openstack_branch}.tar.gz')},
-    'sahara-base-plugin-vanilla': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/sahara-plugin-vanilla/'
-                     'sahara-plugin-vanilla-${openstack_branch}.tar.gz')},
     'skyline-apiserver': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/skyline-apiserver/'
diff --git a/kolla/common/users.py b/kolla/common/users.py
index 5b0e2da74..f3c559f52 100644
--- a/kolla/common/users.py
+++ b/kolla/common/users.py
@@ -161,7 +161,7 @@ USERS = {
         'uid': 42440,
         'gid': 42440,
     },
-    'sahara-user': {
+    'sahara-user': {  # unused user (sahara dropped)
         'uid': 42441,
         'gid': 42441,
     },
diff --git a/releasenotes/notes/remove-sahara-9231cf59e7a812e2.yaml b/releasenotes/notes/remove-sahara-9231cf59e7a812e2.yaml
new file mode 100644
index 000000000..7cc844747
--- /dev/null
+++ b/releasenotes/notes/remove-sahara-9231cf59e7a812e2.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    ``Sahara`` container images have been dropped.
diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml
index ec273711c..2317cc910 100644
--- a/roles/kolla-build-config/defaults/main.yml
+++ b/roles/kolla-build-config/defaults/main.yml
@@ -56,7 +56,6 @@ kolla_build_sources:
     - neutron-base-plugin-vpnaas-agent
   openstack/nova: nova-base
   openstack/octavia: octavia-base
-  openstack/sahara: sahara-base
   openstack/skyline: skyline-base
   openstack/solum: solum-base
   swift-base: openstack/swift
@@ -83,7 +82,6 @@ kolla_build_sources:
   openstack/monasca-ui: horizon-plugin-monasca-ui
   openstack/neutron-vpnaas-dashboard: horizon-plugin-neutron-vpnaas-dashboard
   openstack/octavia-dashboard: horizon-plugin-octavia-dashboard
-  openstack/sahara-dashboard: horizon-plugin-sahara-dashboard
   openstack/solum-dashboard: horizon-plugin-solum-dashboard
   openstack/tacker-horizon: horizon-plugin-tacker-dashboard
   openstack/trove-dashboard: horizon-plugin-trove-dashboard