From a5e84eb38b311ab79c9063f65bbf5717567c6d02 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Tue, 19 Dec 2023 22:46:29 +0100 Subject: [PATCH] Run infrastructure deployments in foreground (#1901) Signed-off-by: Christian Berendt --- .../200-infrastructure-services-basic.sh | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/scripts/deploy/200-infrastructure-services-basic.sh b/scripts/deploy/200-infrastructure-services-basic.sh index 7c34161f..2b30b8d2 100755 --- a/scripts/deploy/200-infrastructure-services-basic.sh +++ b/scripts/deploy/200-infrastructure-services-basic.sh @@ -6,32 +6,30 @@ export INTERACTIVE=false osism apply common osism apply loadbalancer -task_ids=$(osism apply --no-wait --format script openstackclient 2>&1) -task_ids+=" "$(osism apply --no-wait --format script memcached 2>&1) -task_ids+=" "$(osism apply --no-wait --format script redis 2>&1) -task_ids+=" "$(osism apply --no-wait --format script mariadb 2>&1) -task_ids+=" "$(osism apply --no-wait --format script rabbitmq 2>&1) -task_ids+=" "$(osism apply --no-wait --format script openvswitch 2>&1) +osism apply openstackclient +osism apply memcached +osism apply redis +osism apply mariadb +osism apply rabbitmq +osism apply openvswitch MANAGER_VERSION=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.version"}}' osism-ansible) OPENSTACK_VERSION=$(docker inspect --format '{{ index .Config.Labels "de.osism.release.openstack" }}' kolla-ansible) if [[ $MANAGER_VERSION =~ ^4\.[0-9]\.[0-9]$ || $OPENSTACK_VERSION == "yoga" ]]; then - task_ids+=" "$(osism apply --no-wait --format script elasticsearch 2>&1) + osism apply elasticsearch if [[ "$REFSTACK" == "false" ]]; then - task_ids+=" "$(osism apply --no-wait --format script kibana 2>&1) + osism apply kibana fi else - task_ids+=" "$(osism apply --no-wait --format script opensearch 2>&1) + osism apply opensearch fi if [[ "$REFSTACK" == "false" ]]; then - task_ids+=" "$(osism apply --no-wait --format script homer 2>&1) - task_ids+=" "$(osism apply --no-wait --format script phpmyadmin 2>&1) + osism apply homer + osism apply phpmyadmin fi -osism wait --output --format script --delay 2 $task_ids - osism apply ovn if [[ "$REFSTACK" == "false" ]]; then