integrated leap-bootstrap-provider.sh into leap-platform-test

2 files changed, 35 insertions, 40 deletions

diff --git a/leap-bootstrap-provider.sh b/leap-bootstrap-provider.sh
deleted file mode 100755
index 912a705..0000000
--- a/leap-bootstrap-provider.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh -x
-
-. /etc/leap/platform-test.cfg
-
-cd $ROOTDIR/$PROVIDER
-
-if [ -e $ROOTDIR/$PROVIDER ]
-then
-  echo $ROOTDIR/$PROVIDER exists - exiting
-  exit 1
-fi
-
-mkdir  $ROOTDIR/$PROVIDER
-cd  $ROOTDIR/$PROVIDER
-leap new .
-cd $ROOTDIR/leap_platform
-git checkout develop
-git submodule update --init
-cd $ROOTDIR/$PROVIDER
-
-
-leap add-user --self
-leap cert ca && leap cert csr
-leap cert dh
-
-$PLATFORM_TEST_BIN/leap-add-nodes.sh
-$PLATFORM_TEST_BIN/leap-bootstrap-all.sh 
diff --git a/leap-platform-test b/leap-platform-test
index cbae303..961b458 100755
--- a/leap-platform-test
+++ b/leap-platform-test
@@ -10,18 +10,19 @@ This script runs the leap platform deploy tests
 
 OPTIONS
 
-  -c|--config file      specify config file   
-  -a|--all              run command on all nodes
-  -h|--help             show help
+  -c|--config file        specify config file   
+  -a|--all                run command on all nodes
+  -h|--help               show help
 
 COMMANDS
-  bootstrap    <node(s)>   bootstrap node(s):
-                             - leap local start
-                             - leap node int
-                             - sets up hostname and runs apt-get dist-upgrade
-                             - leap local save
-  deploy       <node(s)>   deploy node(s)
-  reset_deploy <node(s)>   reset and deploy node(s)
+  bootstrap    <node(s)>  bootstrap node(s):
+                            - leap local start
+                            - leap node int
+                            - sets up hostname and runs apt-get dist-upgrade
+                            - leap local save
+  create_provider         creates a provider instance
+  deploy       <node(s)>  deploy node(s)
+  reset_deploy <node(s)>  reset and deploy node(s)
   
 EOF
 }
@@ -60,6 +61,26 @@ compile () {
   leap $OPTS compile
 }
 
+create_provider() {
+  if [ -e $ROOTDIR/$PROVIDER ]
+  then
+    echo $ROOTDIR/$PROVIDER exists - exiting
+    exit 1
+  fi
+
+  mkdir  $ROOTDIR/$PROVIDER
+  cd  $ROOTDIR/$PROVIDER
+  leap new .
+  cd $ROOTDIR/leap_platform
+  git checkout develop
+  git submodule update --init
+  cd $ROOTDIR/$PROVIDER
+
+  # for now, we use the vagrant pubkey until https://leap.se/code/issues/2039 is solved
+  leap add-user --self --ssh-pub-key=/usr/lib/ruby/gems/1.9.1/gems/leap_cli-0.2.1/vendor/vagrant_ssh_keys/vagrant.pub
+  leap cert ca && leap cert csr
+  leap cert dh
+}
 
 deploy() {
   LOG="$LOGDIR/deploy-$vm.log"
@@ -175,9 +196,10 @@ echo
 echo "Starting $0 on `date`"
 
 case $cmd in 
-  bootstrap)    bootstrap_nodes "$nodes";;
-  deploy)       deploy "$nodes";;
-  reset_deploy) reset_deploy "$nodes";;
+  bootstrap)        bootstrap_nodes "$nodes";;
+  create_provider)  create_provider;;
+  deploy)           deploy "$nodes";;
+  reset_deploy)     reset_deploy "$nodes";;
 esac