Prepare tests for the Ironic combined service

In I51bf7226aea145dc7c8fd93d61caa233ca16c9c9 we are introducing a way to
run Ironic API and conductor in one process. In the Bifrost change
I9faecfe6ece6d3c35396e3378c1e3930a487e130 we are switching Bifrost to
it, which breaks the Kolla job.

This change makes get_logs.sh aware of the new service. Also drop
RabbitMQ since Bifrost hasn't supported it for a while already.

Change-Id: I30ac6bd4332dacbdce1f5e25bd6a97d2982b208e
This commit is contained in:
Dmitry Tantsur 2021-12-06 11:37:30 +01:00
parent a338df77f1
commit 10616fb19a

View File

@ -93,12 +93,11 @@ copy_logs() {
# bifrost related logs # bifrost related logs
if [[ $(docker ps --filter name=bifrost_deploy --format "{{.Names}}") ]]; then if [[ $(docker ps --filter name=bifrost_deploy --format "{{.Names}}") ]]; then
for service in dnsmasq ironic-api ironic-conductor ironic-inspector mariadb nginx rabbitmq-server; do for service in dnsmasq ironic ironic-api ironic-conductor ironic-inspector mariadb nginx; do
mkdir -p ${LOG_DIR}/kolla/$service mkdir -p ${LOG_DIR}/kolla/$service
docker exec bifrost_deploy systemctl status $service > ${LOG_DIR}/kolla/$service/systemd-status-$service.txt docker exec bifrost_deploy systemctl status $service > ${LOG_DIR}/kolla/$service/systemd-status-$service.txt
done done
docker exec bifrost_deploy journalctl -u mariadb > ${LOG_DIR}/kolla/mariadb/mariadb.txt docker exec bifrost_deploy journalctl -u mariadb > ${LOG_DIR}/kolla/mariadb/mariadb.txt
docker exec bifrost_deploy journalctl -u rabbitmq-server > ${LOG_DIR}/kolla/rabbitmq-server/rabbitmq.txt
fi fi
# haproxy related logs # haproxy related logs