]> gitweb.fluxo.info Git - hydra.git/commitdiff
Change hydra_deploy_facts_collect regexps
authorSilvio Rhatto <rhatto@riseup.net>
Sat, 22 Apr 2017 13:23:09 +0000 (10:23 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Sat, 22 Apr 2017 13:23:09 +0000 (10:23 -0300)
lib/hydra/deploy

index dd26199233766b492daa98f5911e77725ef2949c..7e2d40bb29354214164f8723b08c3790a16ee1d1 100644 (file)
@@ -245,10 +245,10 @@ function hydra_deploy_facts_collect {
     $SUDO facter --yaml > $HYDRA_FOLDER/puppet/config/facts/$FQDN.yaml
   elif [ "$1" == "remote" ]; then
     $HYDRA_CONNECT $FQDN sudo facter --yaml | \
-      grep -v -e "^    seconds"  -e "^    hours"       -e "^    days"     -e "^    uptime"    \
-              -e "^    uptime"   -e "^  system_uptime" -e "^  memoryfree" -e "^  swapfree_mb" \
-              -e "^  memorysize" -e "^  swapfree"      -e "^    seconds"  -e "^    hours"     \
-              -e "^    days"     -e "^  uptime_"       -e "^  macaddress"                     \
+      grep -v -e '^ *seconds'    -e '^ *hours'         -e '^ *days'       -e '^ *uptime'      \
+              -e '^ *uptime'     -e '^ *system_uptime' -e '^ *memoryfree' -e '^ *swapfree_mb' \
+              -e '^ *memorysize' -e '^ *swapfree'      -e '^ *seconds'    -e '^ *hours'       \
+              -e '^ *days'       -e '^ *uptime_'       -e '^ *macaddress'                     \
               > $HYDRA_FOLDER/puppet/config/facts/$FQDN.yaml
 
     # Check result