(MODULES-1638) Remove prompt parameter

Author: elyscape

README.md

@@ -70,8 +70,6 @@ By default, when the provider triggers a reboot, it will skip any resources in t
  * If using `when => pending` style reboots, puppet will apply heuristics to determine if a reboot is pending, e.g. the existence of the PendingFileRenameOperations registry key. If the system reboots, but does not resolve the reboot pending condition, then puppet will reboot the system again. This could lead to a reboot cycle.
  * If puppet performs a reboot, any remaining items in the catalog will be applied the next time puppet runs. In other words, it may take more than one run to reach consistency. In situations where puppet is running as a service, puppet should execute again after the machine boots.
  * In puppet 3.3.0 and up, if puppet performs a reboot, any resource in the catalog that is skipped will be marked as such in the report. In versions prior, skipped resources are omitted from the report.
- * The `prompt` parameter should only be used with `puppet apply`. The prompt isn't displayed during puppet agent runs, which causes the operation to wait indefinitely.
- * The `prompt` parameter is only supported with providers that offer the `supports_reboot_prompting` feature. Currently, only the Windows provider offers this.
 
 ##License
 

lib/puppet/provider/reboot/windows.rb

@@ -5,7 +5,7 @@
   confine :kernel => :windows
   defaultfor :kernel => :windows
 
-  has_features :manages_reboot_pending, :supports_reboot_prompting
+  has_features :manages_reboot_pending
 
   def self.shutdown_command
     if File.exists?("#{ENV['SYSTEMROOT']}\\sysnative\\shutdown.exe")
@@ -51,17 +51,14 @@ def reboot
       cancel_transaction
     end
 
-    # for demo/testing
-    interactive = @resource[:prompt] ? '/i' : nil
-
     shutdown_path = command(:shutdown)
     unless shutdown_path
       raise ArgumentError, "The shutdown.exe command was not found. On Windows 2003 x64 hotfix 942589 must be installed to access the 64-bit version of shutdown.exe from 32-bit version of ruby.exe."
     end
 
     # Reason code
     # E P     4       1       Application: Maintenance (Planned)
-    shutdown_cmd = [shutdown_path, interactive, '/r', '/t', @resource[:timeout], '/d', 'p:4:1', '/c', "\"#{@resource[:message]}\""].join(' ')
+    shutdown_cmd = [shutdown_path, '/r', '/t', @resource[:timeout], '/d', 'p:4:1', '/c', "\"#{@resource[:message]}\""].join(' ')
     async_shutdown(shutdown_cmd)
   end
 

lib/puppet/type/reboot.rb

@@ -55,7 +55,6 @@
   EOT
 
   feature :manages_reboot_pending, "The provider can detect if a reboot is pending, and reboot as needed."
-  feature :supports_reboot_prompting, "The provider can prompt the user to continue the reboot."
 
   newparam(:name) do
     desc "The name of the reboot resource.  Used for uniqueness."
@@ -110,13 +109,6 @@ def insync?(is)
     defaultto "Puppet is rebooting the computer"
   end
 
-  newparam(:prompt, {:boolean => true, :required_features => :supports_reboot_prompting}) do
-    desc "Whether to prompt the user to continue the reboot.  By default, the
-      user will not be prompted."
-    newvalues(:true, :false)
-    defaultto(false)
-  end
-
   newparam(:catalog_apply_timeout) do
     desc "The maximum amount of time in seconds to wait for puppet to finish
       applying the catalog.  If puppet is still running when the timeout is

manifests/init.pp

@@ -29,11 +29,6 @@
 # [*message*]
 #   The message to log when the reboot is performed.
 #
-# [*prompt*]
-#   Whether to prompt the user to continue the reboot. By default, the
-#   user will not be prompted. Valid values are true, false. Should only
-#   be used with `puppet apply`, not puppet agent runs.
-#
 # [*catalog_apply_timeout*]
 #   The maximum amount of time in seconds to wait for puppet to finish
 #   applying the catalog. If puppet is still running when the timeout is

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-reboot",
-  "version": "0.1.10-SNAPSHOT",
+  "version": "0.2.0-SNAPSHOT",
   "author": "puppetlabs",
   "summary": "Adds a type and provider for managing system reboots.",
   "license": "Apache-2.0",

spec/unit/provider/reboot/windows_spec.rb

@@ -99,17 +99,6 @@
       provider.reboot
     end
 
-    it "does not include the interactive flag by default" do
-      provider.expects(:async_shutdown).with(Not(includes('/i')))
-      provider.reboot
-    end
-
-    it "includes the interactive flag if specified" do
-      resource[:prompt] = true
-      provider.expects(:async_shutdown).with(includes('/i'))
-      provider.reboot
-    end
-
     it "includes the restart flag" do
       provider.expects(:async_shutdown).with(includes('/r'))
       provider.reboot

spec/unit/type/reboot_spec.rb

@@ -92,24 +92,6 @@
     end
   end
 
-  context "parameter :prompt" do
-    it "should default to nil" do
-      resource[:prompt].must be_nil
-    end
-
-    it "should accept true on platforms that support prompting" do
-      reboot = Puppet::Type.type(:reboot).new(:name => 'reboot', :provider => :windows)
-      reboot[:prompt] = true
-    end
-
-    it "should reject non-boolean values on platforms that support prompting" do
-      reboot = Puppet::Type.type(:reboot).new(:name => 'reboot', :provider => :windows)
-      expect {
-        reboot[:prompt] = "I'm not sure"
-      }.to raise_error(Puppet::ResourceError, /Invalid value "I'm not sure"/)
-    end
-  end
-
   context "parameter :catalog_apply_timeout" do
     it "should default to 7200 seconds" do
       resource[:catalog_apply_timeout].must == 7200

tests/sample.pp

@@ -4,7 +4,6 @@
 }
 
 reboot { 'now':
-  prompt    => true,
   subscribe => File['c:/before.txt']
 }