Fixing remote install; now starting as upstart daemon.
diff --git a/tools/test/bin/onos-config b/tools/test/bin/onos-config
index 8730b4a..11e7349 100755
--- a/tools/test/bin/onos-config
+++ b/tools/test/bin/onos-config
@@ -12,9 +12,6 @@
onos=$ONOS_INSTALL_DIR/bin/onos
ssh $remote "
- echo 'Starting...'
- nohup $ONOS_INSTALL_DIR/bin/onos-ctl server </dev/null | 1>/opt/onos/svc.log 2>&1 &
-
# Wait until we reach the run-level 100
echo 'Waiting for cluster bootstrap...'
running=""
@@ -22,29 +19,13 @@
$onos bundle:list 2>>$LOG | grep -q 'START LEVEL 100' && running=1 || sleep 2
done
- # Now create group onos and join it, while quitting the default one
- if ! $onos cluster:group-list 2>>$LOG | cut -d \\ -f3 | grep -q onos; then
- echo 'Creating ONOS group...'
- installRole=primary
- $onos cluster:group-create onos 1>>$LOG 2>&1
- fi
-
- echo 'Configuring group membership...'
- node=\$($onos cluster:node-list 2>>$LOG | grep '^x' | cut -d \\ -f3)
- $onos cluster:group-join onos \$node 1>>$LOG 2>&1
- $onos cluster:group-quit default \$node 1>>$LOG 2>&1
-
- if [ X\$installRole = Xprimary ]; then
- echo 'Installing ONOS bundles...'
- $onos cluster:feature-install onos onos-api 1>>$LOG 2>&1
- $onos cluster:feature-install onos onos-core 1>>$LOG 2>&1
- $onos cluster:feature-install onos onos-openflow 1>>$LOG 2>&1
- $onos cluster:feature-install onos onos-cli 1>>$LOG 2>&1
- # $onos cluster:feature-install onos onos-gui 1>>$LOG 2>&1
- # $onos cluster:feature-install onos onos-rest 1>>$LOG 2>&1
- $onos cluster:feature-install onos onos-app-tvue 1>>$LOG 2>&1
- $onos cluster:feature-install onos onos-app-fwd 1>>$LOG 2>&1
- fi
-
- echo 'Started...'
+ echo 'Installing ONOS bundles...'
+ $onos cluster:feature-install default onos-api 1>>$LOG 2>&1
+ $onos cluster:feature-install default onos-core 1>>$LOG 2>&1
+ $onos cluster:feature-install default onos-openflow 1>>$LOG 2>&1
+ $onos cluster:feature-install default onos-cli 1>>$LOG 2>&1
+ # $onos cluster:feature-install default onos-gui 1>>$LOG 2>&1
+ # $onos cluster:feature-install default onos-rest 1>>$LOG 2>&1
+ $onos cluster:feature-install default onos-app-tvue 1>>$LOG 2>&1
+ $onos cluster:feature-install default onos-app-fwd 1>>$LOG 2>&1
"
diff --git a/tools/test/bin/onos-install b/tools/test/bin/onos-install
index 3956541..6454ee0 100755
--- a/tools/test/bin/onos-install
+++ b/tools/test/bin/onos-install
@@ -20,6 +20,13 @@
sudo mkdir -p $ONOS_INSTALL_DIR && sudo chown sdn:sdn $ONOS_INSTALL_DIR
tar zxmf /tmp/$ONOS_BITS.tar.gz -C $ONOS_INSTALL_DIR --strip-components=1
- # Make a link to the log file directory.
+ # Make a link to the log file directory and make a home for auxiliaries
ln -s $ONOS_INSTALL_DIR/$KARAF_DIST/data/log /opt/onos/log
+ mkdir $ONOS_INSTALL_DIR/var
+
+ # Install the upstart configuration file.
+ sudo cp $ONOS_INSTALL_DIR/debian/onos.conf /etc/init/onos.conf
+
+ # Ignite the ONOS service.
+ sudo service onos start
"
diff --git a/tools/test/bin/onos-uninstall b/tools/test/bin/onos-uninstall
index a535c0a..bfc3b48 100755
--- a/tools/test/bin/onos-uninstall
+++ b/tools/test/bin/onos-uninstall
@@ -9,6 +9,7 @@
remote=$ONOS_USER@${1:-$OCI}
ssh $remote "
+ sudo service onos stop 1>/dev/null 2>/dev/null
[ -f $ONOS_INSTALL_DIR/bin/onos ] && \
$ONOS_INSTALL_DIR/bin/onos halt 2>/dev/null
sudo rm -fr $ONOS_INSTALL_DIR