Reorganise a Bit more

install/base-setup

@@ -4,6 +4,17 @@ wget --no-check-certificate https://lab.nexedi.cn/rafael/slapos.playbook/raw/mas
 
 source /tmp/function-common
 
+function download_playbook {
+    DFILE="/tmp/tmpplaybook$(basename $0).$$/"
+    TFILE="archive.tar.gz"
+    mkdir -p $DFILE
+    cd $DFILE
+    wget $1 -O $TFILE
+    tar -xzvf $TFILE
+    rm $TFILE
+    cd */playbook
+}
+
 # Determine what system we are running on.  This provides ``os_VENDOR``,
 # ``os_RELEASE``, ``os_UPDATE``, ``os_PACKAGE``, ``os_CODENAME``
 # and ``DISTRO``

install/slapos.sh

 #!/bin/bash
 
-
 PLAYBOOK_REPOSITORY_URL=https://lab.nexedi.cn/rafael/slapos.playbook/repository/archive.tar.gz?ref=master
-PLAYBOOK_BASE_FOLDER=slapos.playbook.git
-PLAYBOOK_RELATIVE_URL=$PLAYBOOK_BASE_FOLDER/playbook/slapos
 
 wget --no-check-certificate https://lab.nexedi.cn/rafael/slapos.playbook/raw/master/install/base-setup -O /tmp/base-setup
 
 source /tmp/base-setup
 
-function download_playbook {
-  DFILE="/tmp/tmp$(basename $0).$$/"
-  TFILE="archive.tar.gz"
-  cd $DFILE
-  wget $1 -O $TFILE
-  tar -xzvf $TFILE
-  rm $TFILE
-  cd */playbook
-}
-
 download_playbook $PLAYBOOK_REPOSITORY_URL 
 
 clear
 echo "Staring ansible..."
 
-ansible-playbook slapos.yml -i hosts --connection=local
+ansible-playbook site.yml -i hosts --connection=local