diff --git a/library/puppet b/library/puppet
index 912efdc..3b23610 100644
--- a/library/puppet
+++ b/library/puppet
@@ -73,6 +73,13 @@ options:
     required: false
     default: stdout
     version_added: "2.1"
+  noop:
+    description:
+      - Whether puppet should be run in noop mode
+    required: false
+    default: false
+    version_added: "2.1"
+
 requirements: [ puppet ]
 author: "Monty Taylor (@emonty)"
 '''
@@ -125,6 +132,7 @@ def main():
             facts=dict(default=None),
             facter_basename=dict(default='ansible'),
             environment=dict(required=False, default=None),
+            noop=dict(required=False, default=False, type='bool'),
         ),
         supports_check_mode=True,
         mutually_exclusive=[
@@ -187,7 +195,7 @@ def main():
             cmd += " --show_diff"
         if p['environment']:
             cmd += " --environment '%s'" % p['environment']
-        if module.check_mode:
+        if module.check_mode or p['noop']:
             cmd += " --noop"
         else:
             cmd += " --no-noop"
@@ -199,7 +207,7 @@ def main():
             cmd += "--logdest %s " % p['logdest']
         if p['environment']:
             cmd += "--environment '%s' " % p['environment']
-        if module.check_mode:
+        if module.check_mode or p['noop']:
             cmd += "--noop "
         else:
             cmd += "--no-noop "
diff --git a/tasks/main.yml b/tasks/main.yml
index 26ef50f..adac5d1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -64,6 +64,7 @@
       facter_basename: "{{ facter_basename|default(omit) }}"
       logdest: "{{ puppet_logdest|default(omit) }}"
       environment: "{{ puppet_environment|default(omit) }}"
+      noop: "{{ puppet_noop|default(omit) }}"
 - always:
   - name: find logs
     shell: "ls -tr /var/lib/puppet/reports/{{ ansible_fqdn }}/*_puppetdb.json"