summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeap Admins <sysdev@leap.se>2013-05-05 09:21:54 +0000
committerLeap Admins <sysdev@leap.se>2013-05-05 09:21:54 +0000
commit7cc36ac3dfb98bea05e5c32d3ef1ae5ab678311a (patch)
treeb25af42364e9fbb5d8e7f783c5ee1096cd6c17af
parent76e3fb0af9db524c009203dee020d34d5452d8e9 (diff)
integrated leap-add-nodes.sh into leap-platform-test
-rwxr-xr-xleap-add-nodes.sh20
-rwxr-xr-xleap-platform-test16
2 files changed, 16 insertions, 20 deletions
diff --git a/leap-add-nodes.sh b/leap-add-nodes.sh
deleted file mode 100755
index 5143b94..0000000
--- a/leap-add-nodes.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -x
-
-. /etc/leap/platform-test.cfg
-
-cd $ROOTDIR/$PROVIDER
-
-for i in $NODES
-do
- case $i in
- openvpn)
- config='openvpn.gateway_address:10.5.5.99'
- ;;
- *)
- config=''
- ;;
- esac
-
- leap node add --local $i $config services:$i
-done
-
diff --git a/leap-platform-test b/leap-platform-test
index 83b7153..bee3748 100755
--- a/leap-platform-test
+++ b/leap-platform-test
@@ -21,6 +21,22 @@ COMMANDS
EOF
}
+add_nodes() {
+ for i in $@
+ do
+ case $i in
+ openvpn)
+ config='openvpn.gateway_address:10.5.5.99'
+ ;;
+ *)
+ config=''
+ ;;
+ esac
+
+ leap node add --local $i $config services:$i
+ done
+}
+
compile () {
leap $OPTS clean
leap $OPTS compile