Browse Source

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
changes/82/748282/5
Emilien Macchi 2 years ago
parent
commit
5115bfaaea
  1. 9
      container-images/kolla/horizon/extend_start.sh
  2. 8
      healthcheck/sahara-api
  3. 14
      healthcheck/sahara-engine
  4. 1
      zuul.d/layout.yaml

9
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

8
healthcheck/sahara-api

@ -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}/

14
healthcheck/sahara-engine

@ -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

1
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:

Loading…
Cancel
Save