From 8f9320aa054422122287ac63a9ae105762363a19 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Sun, 26 Feb 2012 22:31:42 -0500
Subject: [PATCH] Rename 'ensure' to 'state' because I think it's a bit cleaner
 and doesn't imply all modules take a common parameter name.  But more or less
 we still work idempotently in modules.

---
 copy     |  2 +-
 git      |  2 +-
 service  | 16 ++++++++--------
 template |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/copy b/copy
index a7514fe27b6..bd8c86ccb3f 100644
--- a/copy
+++ b/copy
@@ -10,7 +10,7 @@ except ImportError:
     import simplejson as json
 
 # ===========================================
-# convert arguments of form ensure=running name=foo
+# convert arguments of form a=b c=d
 # to a dictionary
 # FIXME: make more idiomatic
 
diff --git a/git b/git
index 9d85eba2994..873d8a1638d 100755
--- a/git
+++ b/git
@@ -16,7 +16,7 @@ import shlex
 import subprocess
 
 # ===========================================
-# convert arguments of form ensure=running name=foo
+# convert arguments of form a=b c=d
 # to a dictionary
 # FIXME: make more idiomatic
 
diff --git a/service b/service
index 4a20193d512..e28aa8ff8ea 100755
--- a/service
+++ b/service
@@ -10,7 +10,7 @@ import shlex
 import subprocess
 
 # ===========================================
-# convert arguments of form ensure=running name=foo
+# convert arguments of form a=b c=d
 # to a dictionary
 # FIXME: make more idiomatic
 
@@ -22,7 +22,7 @@ for x in items:
     params[k] = v
 
 name = params['name']
-ensure = params.get('ensure','running')
+state = params.get('state','running')
 
 # ===========================================
 # get service status
@@ -43,11 +43,11 @@ elif name == 'iptables' and status.find("ACCEPT") != -1:
     running = True
 
 changed = False
-if not running and ensure == "started":
+if not running and state == "started":
     changed = True
-elif running and ensure == "stopped":
+elif running and state == "stopped":
     changed = True
-elif ensure == "restarted":
+elif state == "restarted":
     changed = True
 
 # ===========================================
@@ -61,11 +61,11 @@ def _run(cmd):
 
 rc = 0
 if changed:
-    if ensure == 'started':
+    if state == 'started':
         rc = _run("/sbin/service %s start" %  name)
-    elif ensure == 'stopped':
+    elif state == 'stopped':
         rc = _run("/sbin/service %s stop" % name)
-    elif ensure == 'restarted':
+    elif state == 'restarted':
         rc1 = _run("/sbin/service %s stop" % name)
         rc2 = _run("/sbin/service %s start" % name)
         rc  = rc1 and rc2
diff --git a/template b/template
index 4ce579c78b7..8868350ae86 100644
--- a/template
+++ b/template
@@ -10,7 +10,7 @@ except ImportError:
     import simplejson as json
 
 # ===========================================
-# convert arguments of form ensure=running name=foo
+# convert arguments of form a=b c=d
 # to a dictionary
 # FIXME: make more idiomatic