Skip to content

Commit

Permalink
pass the ssh-agent path and remove verbosity
Browse files Browse the repository at this point in the history
  • Loading branch information
amitsagtani97 committed Dec 13, 2023
1 parent e82a025 commit 6096d61
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions bin/offline-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions bin/offline-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion bin/offline-helm.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 6096d61

Please sign in to comment.