diff options
| -rw-r--r-- | tools/demo_deploy.sh | 2 | ||||
| -rw-r--r-- | tools/ves-clean.sh | 3 | ||||
| -rw-r--r-- | tools/ves-setup.sh | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/tools/demo_deploy.sh b/tools/demo_deploy.sh index 5567ce6..9a4bd15 100644 --- a/tools/demo_deploy.sh +++ b/tools/demo_deploy.sh @@ -152,7 +152,7 @@ deploy_start=$((`date +%s`/60)) user=$1 master=$2 cloudify=$3 -source ~/k8s_env_$k8s_master_hostname.sh +source ~/k8s_env.sh log "k8s environment as input" env | grep k8s eval `ssh-agent` diff --git a/tools/ves-clean.sh b/tools/ves-clean.sh index 0f9b8d7..0115322 100644 --- a/tools/ves-clean.sh +++ b/tools/ves-clean.sh @@ -137,6 +137,7 @@ function clean_collector() { function clean_barometer() { log "clean ves-barometer" ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \ + $k8s_user@$node <<EOF kubectl delete daemonset --namespace default ves-barometer EOF force_k8s_clean ves-barometer @@ -188,7 +189,7 @@ if [[ $(grep -c $HOSTNAME /etc/hosts) -eq 0 ]]; then sudo tee -a /etc/hosts fi -source ~/k8s_env_$k8s_master_hostname.sh +source ~/k8s_env.sh if [[ -f ~/ves/tools/ves_env.sh ]]; then source ~/ves/tools/ves_env.sh fi diff --git a/tools/ves-setup.sh b/tools/ves-setup.sh index aade964..8d5c902 100644 --- a/tools/ves-setup.sh +++ b/tools/ves-setup.sh @@ -425,7 +425,7 @@ if [[ $(grep -c $HOSTNAME /etc/hosts) -eq 0 ]]; then sudo tee -a /etc/hosts fi -source ~/k8s_env_$k8s_master_hostname.sh +source ~/k8s_env.sh if [[ -f ~/ves/tools/ves_env.sh ]]; then source ~/ves/tools/ves_env.sh fi |