summaryrefslogtreecommitdiff
path: root/src/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-12-21 21:14:11 -0400
committerJoey Hess2014-12-21 21:14:11 -0400
commitd194765e10eae7769210f1b1a19c08835d555fed (patch)
treee9bfae34d38a5376b40f4297ad90855c84ed2e00 /src/Propellor/Property
parent9444326c877d6cf6b25f6750ed9212dbc7c200cd (diff)
propellor spin
Diffstat (limited to 'src/Propellor/Property')
-rw-r--r--src/Propellor/Property/Chroot.hs2
-rw-r--r--src/Propellor/Property/Docker.hs3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs
index 3da8b0d6..ebd38f9a 100644
--- a/src/Propellor/Property/Chroot.hs
+++ b/src/Propellor/Property/Chroot.hs
@@ -137,7 +137,7 @@ chain hostlist (ChrootChain hn loc systemdonly onconsole) =
changeWorkingDirectory localdir
when onconsole forceConsole
onlyProcess (provisioningLock loc) $ do
- r <- runPropellor h $ ensureProperties $
+ r <- runPropellor h $ ensurePropertiesWith ensureProperty' $
if systemdonly
then [Systemd.installed]
else hostProperties h
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index b48afbbb..7a066037 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -456,7 +456,8 @@ chain hostlist hn s = case toContainerId s of
go cid h = do
changeWorkingDirectory localdir
onlyProcess (provisioningLock cid) $ do
- r <- runPropellor h $ ensureProperties $ hostProperties h
+ r <- runPropellor h $ ensurePropertiesWith ensureProperty' $
+ hostProperties h
putStrLn $ "\n" ++ show r
stopContainer :: ContainerId -> IO Bool