Code Review
/
eliot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Cleanup script for Prometheus and CAdvisor"
[eliot.git]
/
scripts
/
src
/
kubeedge_setup.sh
diff --git
a/scripts/src/kubeedge_setup.sh
b/scripts/src/kubeedge_setup.sh
index
9c0b4ef
..
e75c1be
100755
(executable)
--- a/
scripts/src/kubeedge_setup.sh
+++ b/
scripts/src/kubeedge_setup.sh
@@
-17,19
+17,20
@@
take_keedge(){
}
source config_kubeedge
}
source config_kubeedge
-common_steps="sudo git clone https://github.com/kubeedge/kubeedge.git $GOPATH/src/github.com/kubeedge/kubeedge && \
+
+common_steps="echo $GOPATH && \
+echo $HOME && \
+echo $(whoami) && \
+sudo git clone https://github.com/kubeedge/kubeedge.git $GOPATH/src/github.com/kubeedge/kubeedge && \
source ~/.profile && \
cd $GOPATH/src && \
sudo chmod -R 777 github.com && \
cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
make"
source ~/.profile && \
cd $GOPATH/src && \
sudo chmod -R 777 github.com && \
cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
make"
-certif_copy="cd /etc/kubeedge &&\
-scp certs.tar.gz"
-
edge_start="cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
sudo chmod +x kubeedge && \
edge_start="cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm && \
sudo chmod +x kubeedge && \
-sudo ./kubeedge join --edgecontrollerip=$
masternodeip --edgenodeid=eliotedge02 --k8sserverip=$masternodeip
:8080"
+sudo ./kubeedge join --edgecontrollerip=$
MASTERNODEIP --edgenodeid=$EDGENODEID --k8sserverip=$MASTERNODEIP
:8080"
execute_keedge_controller(){
cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
execute_keedge_controller(){
cd $GOPATH/src/github.com/kubeedge/kubeedge/keadm
@@
-39,22
+40,29
@@
execute_keedge_controller(){
exec_edge(){
exec_edge(){
- cd $HOME/eliot/scripts/src
- sshpass -p ${edgenodepassword} scp $HOME/release/eliot/scripts/src/config_kubeedge ${edgenodeusr}@${edgenodeip}:/root
+ cd $PATH_OF_ELIOTFOLDER/scripts/src
+
+ sshpass -p ${EDGENODEPASSWORD} \
+ scp $PATH_OF_ELIOTFOLDER/scripts/src/config_kubeedge \
+ ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
- sshpass -p ${
edgenodepassword} ssh ${edgenodeusr}@${edgenodeip
} \
+ sshpass -p ${
EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP
} \
source config_kubeedge
source config_kubeedge
source config_kubeedge
source config_kubeedge
- sshpass -p ${edgenodepassword} ssh ${edgenodeusr}@${edgenodeip} ${common_steps} < /dev/null
-echo "after common_steps"
- sshpass -p ${edgenodepassword} scp /etc/kubeedge/certs.tgz ${edgenodeusr}@${edgenodeip}:/etc/kubeedge
+ sshpass -p ${EDGENODEPASSWORD} \
+ ssh ${EDGENODEUSR}@${EDGENODEIP} ${common_steps} < /dev/null
- sshpass -p ${edgenodepassword} \
- ssh ${edgenodeusr}@${edgenodeip} \
+ echo "After cloning the code in ELIOT edge node"
+ sshpass -p ${EDGENODEPASSWORD} \
+ scp /etc/kubeedge/certs.tgz ${EDGENODEUSR}@${EDGENODEIP}:/etc/kubeedge
+
+ sshpass -p ${EDGENODEPASSWORD} \
+ ssh ${EDGENODEUSR}@${EDGENODEIP} \
tar -xvzf /etc/kubeedge/certs.tgz --directory /etc/kubeedge
tar -xvzf /etc/kubeedge/certs.tgz --directory /etc/kubeedge
- sshpass -p ${edgenodepassword} ssh ${edgenodeusr}@${edgenodeip} ${edge_start} < /dev/null
+ sshpass -p ${EDGENODEPASSWORD} \
+ ssh ${EDGENODEUSR}@${EDGENODEIP} ${edge_start} < /dev/null
}
# start
}
# start
@@
-66,7
+74,10
@@
take_keedge
execute_keedge_controller
exec_edge
execute_keedge_controller
exec_edge
+
+sleep 10
sudo kubectl get nodes
sudo kubectl get nodes
-chmod +x $HOME/eliot/scripts/verifyk8s.sh
-source $HOME/eliot/scripts/verifyk8s.sh
+chmod +x $PATH_OF_ELIOTFOLDER/scripts/verifyk8s.sh
+source $PATH_OF_ELIOTFOLDER/scripts/verifyk8s.sh
+