minor enhancements

1 files changed, 7 insertions, 6 deletions

diff --git a/leap-platform-test b/leap-platform-test
index 366132e..2cfc101 100755
--- a/leap-platform-test
+++ b/leap-platform-test
@@ -57,7 +57,7 @@ bootstrap_nodes() {
     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
+    $LEAP_CMD $OPTS deploy $vm --tags site_apt::dist_upgrade,site_config::hosts,site_squid_deb_proxy::client
     $LEAP_CMD $OPTS local save $vm
   done
 }
@@ -96,7 +96,7 @@ 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/|   - cd /root/|   - rolling backexecuting|   - files/ca/client_ca.crt|\[bin,puppet\] ->|] Hostname updated.| = Updating submodule puppet/modules|Warning: Permanently added.*to the list of known hosts.| = leap command v| = leap platform v|   - \[.*\] ok'
+  FILTER_CLI='= read|= loading|= no change| - executing| = executing| = applying| = ran git| = checking| = synching| = skipping file_path|   - cd .*; rsync -| - hiera| = created hiera/| = updated hiera/| - cd /root/| - rolling backexecuting| - files/ca/client_ca.crt|\[bin,puppet\] ->|] Hostname updated.| = Updating submodule puppet/modules|Warning: Permanently added.*to the list of known hosts.| = leap command v| = leap platform v| - \[.*\] ok'
 
   FILTER_PUPPET='] notice: |] No change to hostname|] Puppet apply complete|] warning: Dynamic lookup|] warning: Scope\(Class|Skipping because of failed dependencies'
   FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET|$FILTER_COMMON)"
@@ -210,11 +210,11 @@ update_platform () {
 versions () {
   cd $PLATFORMDIR
   platform_head=`git rev-parse HEAD`
-  platform_commit=`git show | head -5`
+  platform_commit=`git show | head -6`
 
   cd $LEAP_SRC
   cli_head=`git rev-parse HEAD`
-  cli_commit=`git show $cli_head | head -5`
+  cli_commit=`git show $cli_head | head -6`
 
   cd $PROVIDERDIR
   [ -d .git ] && provider_head=`git rev-parse HEAD`
@@ -326,13 +326,14 @@ else
 fi
 
 # check if another process is already running with same config file
-procs=`pgrep -fc "leap-platform-test.*-c.*$config"`
+procs=`pgrep -fl 'leap-platform-test.*-c.*/etc/leap/rewire_develop.cfg'|grep -v -i screen|wc -l`
 
-if [ $procs -gt 1 ]; then
+if [ $procs -gt 2 ]; then
   echo "Other process(es) found running for config $config - exiting." 
   exit 1
 fi
 
+
 case $cmd in 
   add_nodes)        add_nodes "$nodes";;
   bootstrap)        bootstrap_nodes "$nodes";;