From 5115bfaaeae6a6c957dd844f4976171761726c81 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 26 Aug 2020 13:56:07 -0400
Subject: [PATCH] TCIB: remove leftovers from sahara

Sahara container images aren't built anymore, but we had some leftovers
that we need to clean up.

Change-Id: I1c3a2592984213133591999f869535651be32a48
---
 container-images/kolla/horizon/extend_start.sh |  9 ---------
 healthcheck/sahara-api                         |  8 --------
 healthcheck/sahara-engine                      | 14 --------------
 zuul.d/layout.yaml                             |  1 -
 4 files changed, 32 deletions(-)
 delete mode 100755 healthcheck/sahara-api
 delete mode 100755 healthcheck/sahara-engine

diff --git a/container-images/kolla/horizon/extend_start.sh b/container-images/kolla/horizon/extend_start.sh
index 5c34f56b2..30f339f04 100644
--- a/container-images/kolla/horizon/extend_start.sh
+++ b/container-images/kolla/horizon/extend_start.sh
@@ -78,14 +78,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}" \
-            "${SITE_PACKAGES}/sahara_dashboard/enabled/${file##*/}" \
-            "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
-    done
-}
-
 # Regenerate the compressed javascript and css if any configuration files have
 # changed.  Use a static modification date when generating the tarball
 # so that we only trigger on content changes.
@@ -111,7 +103,6 @@ config_heat_dashboard
 config_ironic_dashboard
 config_manila_ui
 config_octavia_dashboard
-config_sahara_dashboard
 
 if settings_changed; then
     ${MANAGE_PY} collectstatic --noinput --clear
diff --git a/healthcheck/sahara-api b/healthcheck/sahara-api
deleted file mode 100755
index 28558e613..000000000
--- a/healthcheck/sahara-api
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
-
-bind_host=$(wrap_ipv6 $(get_config_val /etc/sahara/sahara.conf DEFAULT host 127.0.0.1))
-bind_port=$(get_config_val /etc/sahara/sahara.conf DEFAULT port 8386)
-# sahara-api is still eventlet
-healthcheck_curl http://${bind_host}:${bind_port}/
diff --git a/healthcheck/sahara-engine b/healthcheck/sahara-engine
deleted file mode 100755
index 18d50734b..000000000
--- a/healthcheck/sahara-engine
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
-
-process='sahara-engine'
-args="${@:-5671 5672}"
-
-if healthcheck_port $process $args; then
-    exit 0
-else
-    ports=${args// /,}
-    echo "There is no $process process with opened RabbitMQ ports ($ports) running in the container"
-    exit 1
-fi
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 6637af59c..89ad7bc44 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -67,7 +67,6 @@
             files:
               - ^container-images/tcib/base/os/designate.*$
               - ^container-images/tcib/base/os/mistral.*$
-              - ^container-images/tcib/base/os/sahara.*$
         - tripleo-ci-centos-8-scenario004-standalone:
             dependencies: *deps_unit_lint
             vars: