reformat to a standard format

1 files changed, 175 insertions, 174 deletions

diff --git a/leap-platform-test b/leap-platform-test
index 7d17db9..8894c18 100755
--- a/leap-platform-test
+++ b/leap-platform-test
@@ -4,7 +4,7 @@
 
 usage()
 {
-cat << EOF
+    cat << EOF
 
 usage: $0 [options] command [arguments...]
 
@@ -15,6 +15,7 @@ OPTIONS
   -a|--all                 run command on all nodes
   -c|--config file         specify config file
   -h|--help                show help
+  -l|--lock                write a lock file if tests fail, and refuse to deploy if it exists
   -V|--versions            show versions/git revision of leap_cli and leap_platoform in provider dir
 
 COMMANDS
@@ -33,24 +34,24 @@ EOF
 }
 
 add_nodes() {
-  suffix=$IP_SUFFIX_START
-  for i in "$@"
-  do
-    node=${i%:*}
-    services=${i#*:}
-    let suffix++
-    ip="${IP_PREFIX}.$suffix"
-    case $services in
-      openvpn)
-        config="openvpn.gateway_address:${IP_PREFIX}.98 openvpn.second_gateway_address:${IP_PREFIX}.99"
-        ;;
-      *)
-        config=
-        ;;
-    esac
-
-    $LEAP_CMD node add --local "$node"  ip_address:"$ip"  $config services:"$services"
-  done
+    suffix=$IP_SUFFIX_START
+    for i in "$@"
+    do
+        node=${i%:*}
+        services=${i#*:}
+        let suffix++
+        ip="${IP_PREFIX}.$suffix"
+        case $services in
+            openvpn)
+                config="openvpn.gateway_address:${IP_PREFIX}.98 openvpn.second_gateway_address:${IP_PREFIX}.99"
+                ;;
+            *)
+                config=
+                ;;
+        esac
+
+        $LEAP_CMD node add --local "$node"  ip_address:"$ip"  $config services:"$services"
+    done
 }
 
 destroy_vms() {
@@ -62,108 +63,108 @@ destroy_vms() {
 
 bootstrap_nodes() {
 
-  check_for_running_instances || exit $?
-
-  for vm in $@
-  do
-    $LEAP_CMD $OPTS local start "$vm"
-    wait_for_node "$vm"
-    $LEAP_CMD $OPTS node init "$vm"
-    # set hostname + do dist-upgrade
-    $LEAP_CMD $OPTS deploy "$vm" --tags site_apt::dist_upgrade,site_config::hosts,site_squid_deb_proxy::client
-
-    # make sure machines are rebooted in order to be able to load kernel modules after a kernel update
-    # https://leap.se/code/issues/6494
-    cd ${PROVIDERDIR}/test
-    vagrant reload $vm 
+    check_for_running_instances || exit $?
 
-    $LEAP_CMD $OPTS local save "$vm"
-  done
+    for vm in $@
+    do
+        $LEAP_CMD $OPTS local start "$vm"
+        wait_for_node "$vm"
+        $LEAP_CMD $OPTS node init "$vm"
+        # set hostname + do dist-upgrade
+        $LEAP_CMD $OPTS deploy "$vm" --tags site_apt::dist_upgrade,site_config::hosts,site_squid_deb_proxy::client
+
+        # make sure machines are rebooted in order to be able to load kernel modules after a kernel update
+        # https://leap.se/code/issues/6494
+        cd ${PROVIDERDIR}/test
+        vagrant reload $vm 
+
+        $LEAP_CMD $OPTS local save "$vm"
+    done
 }
 
 check_for_running_instances() {
 
-  if [[ $( pidof -x "$( basename "$0" )" -o %PPID ) ]]
-  then 
-    echo "Other process(es) found running for $(basename "$0") - exiting."
-    exit 1
-  fi
+    if [[ $( pidof -x "$( basename "$0" )" -o %PPID ) ]]
+    then 
+        echo "Other process(es) found running for $(basename "$0") - exiting."
+        exit 1
+    fi
 
 }
 
 create_provider() {
- 
-  check_for_running_instances || exit $?
+    
+    check_for_running_instances || exit $?
 
-  if [ -e "$PROVIDERDIR" ]
-  then
-    echo "$PROVIDERDIR" exists - exiting
-    exit 1
-  fi
+    if [ -e "$PROVIDERDIR" ]
+    then
+        echo "$PROVIDERDIR" exists - exiting
+        exit 1
+    fi
 
-  git clone -b "$PLATFORM_BRANCH" --recursive https://leap.se/git/leap_platform.git "$PLATFORMDIR"
+    git clone -b "$PLATFORM_BRANCH" --recursive https://leap.se/git/leap_platform.git "$PLATFORMDIR"
 
-  mkdir -p  "$PROVIDERDIR"
-  cd  "$PROVIDERDIR"
-  $LEAP_CMD $OPTS new --contacts "$CONTACTS" --domain "$DOMAIN" --name "$PROVIDER" --platform="$PLATFORMDIR" .
+    mkdir -p  "$PROVIDERDIR"
+    cd  "$PROVIDERDIR"
+    $LEAP_CMD $OPTS new --contacts "$CONTACTS" --domain "$DOMAIN" --name "$PROVIDER" --platform="$PLATFORMDIR" .
 
 
-  # for now, we use the vagrant pubkey until https://leap.se/code/issues/2039 is solved
-  $LEAP_CMD $OPTS add-user --self --ssh-pub-key="$SSHKEY"
-  $LEAP_CMD $OPTS cert ca && $LEAP_CMD $OPTS cert csr
+    # for now, we use the vagrant pubkey until https://leap.se/code/issues/2039 is solved
+    $LEAP_CMD $OPTS add-user --self --ssh-pub-key="$SSHKEY"
+    $LEAP_CMD $OPTS cert ca && $LEAP_CMD $OPTS cert csr
 
-  # copy for faster testing
-  #cp $ROOTDIR/dh.pem.test $PROVIDERDIR/files/ca/dh.pem
-  $LEAP_CMD $OPTS cert dh
-  add_nodes $NODES
+    # copy for faster testing
+    #cp $ROOTDIR/dh.pem.test $PROVIDERDIR/files/ca/dh.pem
+    $LEAP_CMD $OPTS cert dh
+    add_nodes $NODES
 
-  git init
-  git add .
-  git commit -m"finished create_provider"  
+    git init
+    git add .
+    git commit -m"finished create_provider"  
 }
 
 deploy() {
 
-  # we need to deploy with verbose level 2, and filter out unwanted stuff
-  # until puppet errors show up in verbose level 0 +1 (#1750)
-  FILTER_CLI='= read|= loading|= no change| - executing| = executing| = applying| = ran git| = checking| = synching| = skipping file_path|   - cd .*; rsync -| - hiera| = created hiera/| = updated hiera/| = updated secrets.json| - cd /root/| - rolling backexecuting| - files/|\[bin,tests,puppet\] ->|] Hostname updated.| = Updating submodule puppet/modules|Warning: Permanently added.*to the list of known hosts.| = leap command v| = leap platform v| - \[.*\] ok| - \[.*\] STARTING APPLY| - \[.*\] APPLY COMPLETE'
+    # we need to deploy with verbose level 2, and filter out unwanted stuff
+    # until puppet errors show up in verbose level 0 +1 (#1750)
+    FILTER_CLI='= read|= loading|= no change| - executing| = executing| = applying| = ran git| = checking| = synching| = skipping file_path|   - cd .*; rsync -| - hiera| = created hiera/| = updated hiera/| = updated secrets.json| - cd /root/| - rolling backexecuting| - files/|\[bin,tests,puppet\] ->|] Hostname updated.| = Updating submodule puppet/modules|Warning: Permanently added.*to the list of known hosts.| = leap command v| = leap platform v| - \[.*\] ok| - \[.*\] STARTING APPLY| - \[.*\] APPLY COMPLETE'
 
-  FILTER_PUPPET="] notice: |] No change to hostname|] Puppet apply complete \(changes made\).|] warning: Dynamic lookup|] warning: Scope\(Class|Skipping because of failed dependencies|warning: You cannot collect without storeconfigs being set|warning: default \`to_a' will be obsolete"
+    FILTER_PUPPET="] notice: |] No change to hostname|] Puppet apply complete \(changes made\).|] warning: Dynamic lookup|] warning: Scope\(Class|Skipping because of failed dependencies|warning: You cannot collect without storeconfigs being set|warning: default \`to_a' will be obsolete"
 
-  if [ -n "$FILTER_COMMON" ]
-  then 
-    FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET|$FILTER_COMMON)"
-  else
-    FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET)"
-  fi 
+    if [ -n "$FILTER_COMMON" ]
+    then 
+        FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET|$FILTER_COMMON)"
+    else
+        FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET)"
+    fi 
 
 
-  for vm in "$@"
-  do
-    [ -e "$LOGDIR" ] || mkdir -p "$LOGDIR"
-    date=$( date +"%F-%H%M%S" )
-    LOG1="$LOGDIR/deploy-$vm.log"
-    LOG2="$LOGDIR/deploy-$vm-$date.log"
-    ERRLOG1="$LOGDIR/deploy-$vm-$date-error.log"
-    ERRLOG2="$LOGDIR/deploy-error.log"
-    echo "Deploying \"$vm\" on $( date )"|tee -a "$LOG1" "$LOG2"
-
-    $LEAP_CMD $OPTS -v 2 deploy "$vm" 2>&1 | ts | tee -a "$LOG1" "$LOG2" | egrep -v "$FILTER_ALL" | tee -a "$ERRLOG1" "$ERRLOG2" > /dev/null
-  done
+    for vm in "$@"
+    do
+        [ -e "$LOGDIR" ] || mkdir -p "$LOGDIR"
+        date=$( date +"%F-%H%M%S" )
+        LOG1="$LOGDIR/deploy-$vm.log"
+        LOG2="$LOGDIR/deploy-$vm-$date.log"
+        ERRLOG1="$LOGDIR/deploy-$vm-$date-error.log"
+        ERRLOG2="$LOGDIR/deploy-error.log"
+        echo "Deploying \"$vm\" on $( date )"|tee -a "$LOG1" "$LOG2"
+
+        $LEAP_CMD $OPTS -v 2 deploy "$vm" 2>&1 | ts | tee -a "$LOG1" "$LOG2" | egrep -v "$FILTER_ALL" | tee -a "$ERRLOG1" "$ERRLOG2" > /dev/null
+    done
 } 
 
 get_ip () {
-  grep ip_address "$PROVIDERDIR/nodes/$1.json" |cut -f 2 -d:|sed 's/[ ",]//g'
+    grep ip_address "$PROVIDERDIR/nodes/$1.json" |cut -f 2 -d:|sed 's/[ ",]//g'
 }
 
 ip_pingable () {
-  ping -q -W10 -c1 "$1" >/dev/null 2>&1
-  return $?
+    ping -q -W10 -c1 "$1" >/dev/null 2>&1
+    return $?
 }
 
 log_start() {
-  echo
-  echo "Starting $0 on $( date )"
+    echo
+    echo "Starting $0 on $( date )"
 }
 
 deploy_failure_email() {
@@ -364,74 +365,74 @@ destroy_deploy() {
 }
 
 ssh_up () {
-  nc -w 4 "$1" 22 > /dev/null
-  return $?
+    nc -w 4 "$1" 22 > /dev/null
+    return $?
 }
 
 run_tests () {
 
-  date=$( date +"%F-%H%M%S" )
-  TEST_FILTER='net.ssh.authentication.agent.*could not connect to ssh-agent'
+    date=$( date +"%F-%H%M%S" )
+    TEST_FILTER='net.ssh.authentication.agent.*could not connect to ssh-agent'
 
 
-  echo -e "\nRunning leap test on $date" | tee -a "$TEST_LOG1" "$TEST_LOG2" 
-  $LEAP_CMD $OPTS test --continue 2>&1 | ts | egrep -v "$TEST_FILTER" | tee -a "$TEST_LOG1" "$TEST_LOG2" 
-  test_failure=${PIPESTATUS[0]}
- 
-  if [ "$test_failure" -ne 0 ]
-  then
-    echo 'WARNING - "leap test" failed !' | tee -a "$TEST_LOG1" "$TEST_LOG2"
-  else
-    echo 'OK - "leap test" is all green !' | tee -a "$TEST_LOG1" "$TEST_LOG2"
-  fi
-  return "$test_failure"
+    echo -e "\nRunning leap test on $date" | tee -a "$TEST_LOG1" "$TEST_LOG2" 
+    $LEAP_CMD $OPTS test --continue 2>&1 | ts | egrep -v "$TEST_FILTER" | tee -a "$TEST_LOG1" "$TEST_LOG2" 
+    test_failure=${PIPESTATUS[0]}
+    
+    if [ "$test_failure" -ne 0 ]
+    then
+        echo 'WARNING - "leap test" failed !' | tee -a "$TEST_LOG1" "$TEST_LOG2"
+    else
+        echo 'OK - "leap test" is all green !' | tee -a "$TEST_LOG1" "$TEST_LOG2"
+    fi
+    return "$test_failure"
 
 }
 
 update_leap_cli () {
-  cd "$LEAP_SRC"
-  git pull
-  sudo bundle
+    cd "$LEAP_SRC"
+    git pull
+    sudo bundle
 }
 
 
 update_platform () {
-  cd "$PLATFORMDIR"
-  git pull
+    cd "$PLATFORMDIR"
+    git pull
 }
 
 versions () {
 
-  cd "$PROVIDERDIR"
-  [ -d .git ] && provider_head=$( git rev-parse HEAD )
-  if [ -n "$provider_head" ]
-  then
-    provider_head='not under version control'
-  fi  
-
-  echo "Provider ($PROVIDERDIR): $provider_head"
-  echo
-
-  $LEAP_CMD -v 2 list | grep ' = leap command v'
-  echo
-  echo
-  
-  #echo "leap_platform:"
-  $LEAP_CMD -v 2 list | grep ' = leap platform v'
-  echo
-  echo
+    cd "$PROVIDERDIR"
+    [ -d .git ] && provider_head=$( git rev-parse HEAD )
+    if [ -n "$provider_head" ]
+    then
+        provider_head='not under version control'
+    fi  
+
+    echo "Provider ($PROVIDERDIR): $provider_head"
+    echo
+
+    $LEAP_CMD -v 2 list | grep ' = leap command v'
+    echo
+    echo
+    
+    #echo "leap_platform:"
+    $LEAP_CMD -v 2 list | grep ' = leap platform v'
+    echo
+    echo
 }
 
 wait_for_node() {
-  vm=$1
-  ip=$( get_ip "$vm" )
-  online=0
-  echo "Waiting for ssh on VM $vm (IP: $ip) to come up..."
-  while [ $online -eq 0 ]
-  do
-    ssh_up "$ip" && online=1
-    sleep 1
-  done
+    vm=$1
+    ip=$( get_ip "$vm" )
+    online=0
+    echo "Waiting for ssh on VM $vm (IP: $ip) to come up..."
+    while [ $online -eq 0 ]
+    do
+        ssh_up "$ip" && online=1
+        sleep 1
+    done
 }
 
 
@@ -451,25 +452,25 @@ deploy_failure="/tmp/deploy_failure"
 
 if ! options=$(getopt -o avVc:h -l all,verbose,versions,config:,help -- "$@")
 then 
-  # something went wrong, getopt will put out an error message for us
-  usage
-  exit 1
+    # something went wrong, getopt will put out an error message for us
+    usage
+    exit 1
 fi  
 
 eval set -- "$options"
 
 while [ $# -gt 0 ]
 do
-  case $1 in
-    -h|--help)     usage; exit 1;;
-    -c|--config)   config=$2; shift ;;
-    -a|--all)      all=true;;
-    -V|--versions)  print_versions=true;; 
-    (--) shift; break;;
-    (-*) echo "$0: error - unrecognized option $1" 1>&2; exit 1;;
-    (*) break;;
-  esac
-  shift
+    case $1 in
+        -h|--help)     usage; exit 1;;
+        -c|--config)   config=$2; shift ;;
+        -a|--all)      all=true;;
+        -V|--versions)  print_versions=true;; 
+        (--) shift; break;;
+        (-*) echo "$0: error - unrecognized option $1" 1>&2; exit 1;;
+        (*) break;;
+    esac
+    shift
 done
 
 
@@ -484,9 +485,9 @@ nodelist="$*"
 
 if [ -z "$config" ]
 then
-  usage
-  echo "Please provide a config file"
-  exit 1
+    usage
+    echo "Please provide a config file"
+    exit 1
 fi
 
 # provider specific config
@@ -503,40 +504,40 @@ TEST_LOG2="$LOGDIR/test-$date.log"
 
 if $print_versions
 then
-  versions=$( versions )
-  echo "$versions"
-  echo
-  exit 0
+    versions=$( versions )
+    echo "$versions"
+    echo
+    exit 0
 fi
 
 if [ -z "$LEAP_CMD" -o -z "$LEAP_SRC" ] 
 then
-  echo "please provide a path to the leap_cli binary and the source in the config file, using the LEAP_CMD and LEAP_SRC var."
-  exit 1
+    echo "please provide a path to the leap_cli binary and the source in the config file, using the LEAP_CMD and LEAP_SRC var."
+    exit 1
 fi
 
 if $all ; then
-  # use NODES variable from the config file
-  nodes=$NODES
+    # use NODES variable from the config file
+    nodes=$NODES
 
-  # strip services from nodes_services
-  # i.e. nodes_services='redevcouchdb1:couchdb redevcouchdb2:couchdb'
-  # -> nodes='redevcouchdb1 redevcouchdb2'
-  nodes=$( echo "$NODES" | sed 's/:[[:alnum:],]*//g' )
+    # strip services from nodes_services
+    # i.e. nodes_services='redevcouchdb1:couchdb redevcouchdb2:couchdb'
+    # -> nodes='redevcouchdb1 redevcouchdb2'
+    nodes=$( echo "$NODES" | sed 's/:[[:alnum:],]*//g' )
 else
-  # use nodelist provided via cmdline parameters
-  nodes=$nodelist
+    # use nodelist provided via cmdline parameters
+    nodes=$nodelist
 fi
 
 
 case $cmd in 
-  add_nodes)        add_nodes "$nodes";;
-  bootstrap)        bootstrap_nodes "$nodes";;
-  create_provider)  create_provider;;
-  deploy)           deploy "$nodes";;
-  destroy_deploy)   destroy_deploy "$nodes";;
-  init_deploy)      init_deploy "$nodes";;
-  reset_deploy)     reset_deploy "$nodes";;
-  test)             run_tests "$nodes";;
-  (*)               usage; echo "Please specify a command."; exit 1;;
+    add_nodes)        add_nodes "$nodes";;
+    bootstrap)        bootstrap_nodes "$nodes";;
+    create_provider)  create_provider;;
+    deploy)           deploy "$nodes";;
+    destroy_deploy)   destroy_deploy "$nodes";;
+    init_deploy)      init_deploy "$nodes";;
+    reset_deploy)     reset_deploy "$nodes";;
+    test)             run_tests "$nodes";;
+    (*)               usage; echo "Please specify a command."; exit 1;;
 esac