From 6096d6140ca612d6ccf5772a9fe7452e47739e39 Mon Sep 17 00:00:00 2001 From: Amit Sagtani Date: Wed, 13 Dec 2023 16:14:24 +0100 Subject: [PATCH] pass the ssh-agent path and remove verbosity --- bin/offline-cluster.sh | 8 ++++---- bin/offline-deploy.sh | 3 +-- bin/offline-helm.sh | 3 ++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/offline-cluster.sh b/bin/offline-cluster.sh index 9e49b1c2f..f26fcd947 100755 --- a/bin/offline-cluster.sh +++ b/bin/offline-cluster.sh @@ -62,7 +62,7 @@ ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/kubernetes.yml --skip-tags boot ./bin/fix_default_router.sh # Deploy all other services which don't run in kubernetes. -ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/cassandra.yml -vvv -ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/elasticsearch.yml -vvv -ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/minio.yml -vvv -ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/restund.yml -vvv +ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/cassandra.yml +ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/elasticsearch.yml +ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/minio.yml +ansible-playbook -i $INVENTORY_FILE $ANSIBLE_DIR/restund.yml diff --git a/bin/offline-deploy.sh b/bin/offline-deploy.sh index cfc475c76..87ec89da5 100755 --- a/bin/offline-deploy.sh +++ b/bin/offline-deploy.sh @@ -18,6 +18,5 @@ WSD_CONTAINER=$(sudo docker load -i $SCRIPT_DIR/../containers-adminhost/containe ./bin/offline-secrets.sh - sudo docker run --network=host -v $SSH_AUTH_SOCK:/ssh-agent -e SSH_AUTH_SOCK=/ssh-agent -v $PWD:/wire-server-deploy $WSD_CONTAINER ./bin/offline-cluster.sh -sudo docker run --network=host -v $PWD:/wire-server-deploy $WSD_CONTAINER ./bin/offline-helm.sh +sudo docker run --network=host -v $PWD:/wire-server-deploy -e SSH_AUTH_SOCK=/ssh-agent $WSD_CONTAINER ./bin/offline-helm.sh diff --git a/bin/offline-helm.sh b/bin/offline-helm.sh index cbde95ff7..4f824d790 100755 --- a/bin/offline-helm.sh +++ b/bin/offline-helm.sh @@ -1,10 +1,11 @@ #!/usr/bin/env bash set -euo pipefail +set -x SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ANSIBLE_DIR="$( cd "$SCRIPT_DIR/../ansible" && pwd )" -ansible-playbook -i "$ANSIBLE_DIR"/inventory/offline "$ANSIBLE_DIR"/helm_external.yml +ansible-playbook -i "$ANSIBLE_DIR"/inventory/offline "$ANSIBLE_DIR"/helm_external.yml -vv helm upgrade --install --wait cassandra-external ./charts/cassandra-external --values ./values/cassandra-external/values.yaml helm upgrade --install --wait elasticsearch-external ./charts/elasticsearch-external --values ./values/elasticsearch-external/values.yaml