From 0ea0f7f4dee7f0e0835a82814fa89af6ce1756a1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 23 Nov 2014 15:17:57 -0400
Subject: --spin can be passed multiple hosts, and it will provision each host
 in turn.

Note that if it fails to spin a host, it will stop. I think this is better
than continuing to the next, because there might be a reason to spin hosts
in some specific order (ie, update dns first and then use it).
---
 src/Propellor/Spin.hs | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'src/Propellor/Spin.hs')

diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs
index 06bac330..8606013a 100644
--- a/src/Propellor/Spin.hs
+++ b/src/Propellor/Spin.hs
@@ -1,4 +1,5 @@
 module Propellor.Spin (
+	commitSpin,
 	spin,
 	update,
 	gitPushHelper
@@ -23,18 +24,19 @@ import qualified Propellor.Shim as Shim
 import Utility.FileMode
 import Utility.SafeCommand
 
+commitSpin :: IO ()
+commitSpin = do
+	void $ actionMessage "Git commit" $
+		gitCommit [Param "--allow-empty", Param "-a", Param "-m", Param "propellor spin"]
+	-- Push to central origin repo first, if possible.
+	-- The remote propellor will pull from there, which avoids
+	-- us needing to send stuff directly to the remote host.
+	whenM hasOrigin $
+		void $ actionMessage "Push to central git repository" $
+			boolSystem "git" [Param "push"]
+
 spin :: HostName -> Maybe HostName -> Host -> IO ()
 spin target relay hst = do
-	unless relaying $ do
-		void $ actionMessage "Git commit" $
-			gitCommit [Param "--allow-empty", Param "-a", Param "-m", Param "propellor spin"]
-		-- Push to central origin repo first, if possible.
-		-- The remote propellor will pull from there, which avoids
-		-- us needing to send stuff directly to the remote host.
-		whenM hasOrigin $
-			void $ actionMessage "Push to central git repository" $
-				boolSystem "git" [Param "push"]
-	
 	cacheparams <- if viarelay
 		then pure ["-A"]
 		else toCommand <$> sshCachingParams hn
@@ -78,7 +80,7 @@ spin target relay hst = do
 
 	runcmd = "cd " ++ localdir ++ " && ./propellor " ++ cmd
 	cmd = if viarelay
-		then "--serialized " ++ shellEscape (show (Spin target (Just target)))
+		then "--serialized " ++ shellEscape (show (Spin [target] (Just target)))
 		else "--continue " ++ shellEscape (show (SimpleRun target))
 
 -- Update the privdata, repo url, and git repo over the ssh
-- 
cgit v1.3-2-g0d8e