Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit 329b176

Browse files
kiwikdims
authored andcommitted
Add -f option to avoid ln cmd failing when target exist
If we run ./stack.sh again in the same host, test-setup.sh will fail, because go and gofmt link have existed in the host, ln command will throw error, like this: ln: failed to create symbolic link '/usr/local/bin/gofmt': File exists
1 parent 742d4ea commit 329b176

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

devstack/plugin.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ function install_k8s_cloud_provider {
9090
# Seed the log files so devstack-gate can capture the logs
9191
export LOG_DIR=${SCREEN_LOGDIR:-/opt/stack/logs}
9292
sudo mkdir -p $LOG_DIR
93-
sudo touch $LOG_DIR/kube-apiserver.log;sudo ln -s $LOG_DIR/kube-apiserver.log $LOG_DIR/screen-kube-apiserver.log
94-
sudo touch $LOG_DIR/kube-controller-manager.log;sudo ln -s $LOG_DIR/kube-controller-manager.log $LOG_DIR/screen-kube-controller-manager.log
95-
sudo touch $LOG_DIR/kube-proxy.log;sudo ln -s $LOG_DIR/kube-proxy.log $LOG_DIR/screen-kube-proxy.log
96-
sudo touch $LOG_DIR/kube-scheduler.log;sudo ln -s $LOG_DIR/kube-scheduler.log $LOG_DIR/screen-kube-scheduler.log
97-
sudo touch $LOG_DIR/kubelet.log;sudo ln -s $LOG_DIR/kubelet.log $LOG_DIR/screen-kubelet.log
93+
sudo touch $LOG_DIR/kube-apiserver.log;sudo ln -sf $LOG_DIR/kube-apiserver.log $LOG_DIR/screen-kube-apiserver.log
94+
sudo touch $LOG_DIR/kube-controller-manager.log;sudo ln -sf $LOG_DIR/kube-controller-manager.log $LOG_DIR/screen-kube-controller-manager.log
95+
sudo touch $LOG_DIR/kube-proxy.log;sudo ln -sf $LOG_DIR/kube-proxy.log $LOG_DIR/screen-kube-proxy.log
96+
sudo touch $LOG_DIR/kube-scheduler.log;sudo ln -sf $LOG_DIR/kube-scheduler.log $LOG_DIR/screen-kube-scheduler.log
97+
sudo touch $LOG_DIR/kubelet.log;sudo ln -sf $LOG_DIR/kubelet.log $LOG_DIR/screen-kubelet.log
9898

9999
echo "Stopping firewall and allow all traffic..."
100100
sudo iptables -F

tools/test-setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ case $OS in
5050
fi
5151
sudo add-apt-repository --yes ppa:gophers/archive
5252
sudo apt-get update && sudo $APT_GET install golang-1.9-go
53-
sudo ln -s /usr/lib/go-1.9/bin/go /usr/local/bin
54-
sudo ln -s /usr/lib/go-1.9/bin/gofmt /usr/local/bin
53+
sudo ln -sf /usr/lib/go-1.9/bin/go /usr/local/bin
54+
sudo ln -sf /usr/lib/go-1.9/bin/gofmt /usr/local/bin
5555
wget -O install-glide.sh https://glide.sh/get
5656
export GOPATH=$HOME/go
5757
export PATH=$PATH:$HOME/go/bin

0 commit comments

Comments
 (0)