Skip to content

Commit

Permalink
Run infrastructure deployments in foreground (#1901)
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Berendt <[email protected]>
  • Loading branch information
berendt authored Dec 19, 2023
1 parent ca07a48 commit a5e84eb
Showing 1 changed file with 11 additions and 13 deletions.
24 changes: 11 additions & 13 deletions scripts/deploy/200-infrastructure-services-basic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a5e84eb

Please sign in to comment.