Cleanup bugfixes. Move vars to dedicated files

scripts/.common

@@ -1,24 +1,6 @@
 #!/bin/bash
 
-## Vars
-# Docker container name for dir2config
-D2C_CTR_NAME=dir2config
-# Docker container name for direktil local server
-DLS_CTR_NAME=dls
-
-# QEMU local bridge name. If you specificy a custom name, you may have to configure qemu bridge helper to allow it
-QEMU_BR_NAME=virbr0
-# QEMU VM default disk size
-QEMU_DISK_SIZE=30G
-# Allocated CPUs to QEMU VMs
-QEMU_VM_CPU=4
-# Allocated Memory to QEMU VMs
-QEMU_VM_MEM=8096
-################
-
-# Token file for dls
-tknfile=".dls_adm_token"
-
+source $(dirname $0)/vars
 
 ## Helper funcs
 
@@ -57,9 +39,10 @@ check_root() {
 }
 
 prereqs() {
-  # set -ex
+  set -e
   cd "$(dirname $0)/.."
   ctxdir="$PWD"
+  source scripts/vars
 }
 
 check_conf() {