홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
46a4fe2e 1 parent 5eb79c5f

Fixing onos-uninstall to be idempotent. 

Fixing toms & andrea cells to by default use secure CLI access.

Change-Id: Icf951de4cad396fa3925b397270aedfb320b8855
Inline Side-by-side
Showing 3 changed files with 10 additions and 5 deletions
...@@ -34,9 +34,12 @@ ssh $remote " ...@@ -34,9 +34,12 @@ ssh $remote "
34 [ -z \"\$(ps -ef | grep karaf.jar | grep -v grep)\" ] && break 34 [ -z \"\$(ps -ef | grep karaf.jar | grep -v grep)\" ] && break
35 sleep 1 35 sleep 1
36 done 36 done
37 - [ -z \"\$(ps -ef | grep karaf.jar | grep -v grep)\" ] || echo 'ONOS failed to stop.' 37 + [ -z \"\$(ps -ef | grep karaf.jar | grep -v grep)\" ] || \
38 + (echo 'ONOS failed to stop.'; status=1)
38 39
39 # Remove onos directory and init file 40 # Remove onos directory and init file
40 - sudo rm -fr $ONOS_INSTALL_DIR 41 + [ -d $ONOS_INSTALL_DIR ] && sudo rm -fr $ONOS_INSTALL_DIR
41 - [ -f /etc/init/onos.conf ] && sudo rm /etc/init/onos.conf 42 + [ -f /etc/init/onos.conf ] && sudo rm -f /etc/init/onos.conf
43 +
44 + exit \${status:-0};
42 " 45 "
......
...@@ -7,4 +7,5 @@ export OC3="10.128.12.3" ...@@ -7,4 +7,5 @@ export OC3="10.128.12.3"
7 export OCN="10.128.12.4" 7 export OCN="10.128.12.4"
8 8
9 export OCT=$OC1 9 export OCT=$OC1
10 -export ONOS_APPS=drivers,openflow,proxyarp 10 +export ONOS_USE_SSH=true
11 +export ONOS_APPS=drivers,openflow,proxyarp,mobility
......
...@@ -7,4 +7,5 @@ export OC3="10.128.11.3" ...@@ -7,4 +7,5 @@ export OC3="10.128.11.3"
7 export OCN="10.128.11.4" 7 export OCN="10.128.11.4"
8 8
9 export OCT=$OC1 9 export OCT=$OC1
10 -export ONOS_APPS=drivers,openflow,proxyarp
...\ No newline at end of file ...\ No newline at end of file
10 +export ONOS_USE_SSH=true
11 +export ONOS_APPS=drivers,openflow,proxyarp,mobility
...\ No newline at end of file ...\ No newline at end of file
......