summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-09-27 22:52:57 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-09-27 22:52:57 -0300
commit71b49674073f8ca471a95f62c2552ad03842bab4 (patch)
treecf0716e5043643aa1782fd257b68b7ab35b97570
parent230a91f93c14a4bc8a936ecf3539145c9a7c20d5 (diff)
downloadhydra-71b49674073f8ca471a95f62c2552ad03842bab4.tar.gz
hydra-71b49674073f8ca471a95f62c2552ad03842bab4.tar.bz2
Misc tunning
-rwxr-xr-xshare/hydra/mass2
-rwxr-xr-xshare/hydractl/puppet-reset-agent4
2 files changed, 3 insertions, 3 deletions
diff --git a/share/hydra/mass b/share/hydra/mass
index 0e69c01..142c687 100755
--- a/share/hydra/mass
+++ b/share/hydra/mass
@@ -8,7 +8,7 @@ function mass_pssh {
echo "Issuing $COMMAND on multiple nodes..."
hydra_set_tmpfile nodes
hydra $HYDRA nodes > $TMPWORK
- parallel-ssh -P -h $TMPWORK sudo $COMMAND
+ parallel-ssh -t 40 -P -h $TMPWORK sudo $COMMAND
hydra_unset_tmpfile $TMPWORK
}
diff --git a/share/hydractl/puppet-reset-agent b/share/hydractl/puppet-reset-agent
index 1640758..eb7181e 100755
--- a/share/hydractl/puppet-reset-agent
+++ b/share/hydractl/puppet-reset-agent
@@ -5,5 +5,5 @@
/etc/init.d/puppet stop
rm -rf /var/lib/puppet/ssl
-puppetd --server puppet.`facter domain` --waitforcert 60 --test --ca_port 8141 \
- --vardir /var/lib/puppet --ssldir /var/lib/puppet/ssl
+puppet agent --server puppet.`facter domain` --waitforcert 60 --test --ca_port 8141 \
+ --vardir /var/lib/puppet --ssldir /var/lib/puppet/ssl