Merge pull request #308 from HelenCampbell/keyUpdates

Update to readme and test for key params

Author: jonnytdevops

README.markdown

@@ -192,19 +192,19 @@ Specifies one or more network interfaces for NTP to listen on. Valid options: ar
 
 ####`keys_controlkey`
 
-Provides a control key to be used by NTP. Valid options: string. Default value: ' '
+Specifies the key identifier to use with the ntpq utility. Valid options: value in the range of 1 to 65,534 inclusive. Default value: ' '
 
 ####`keys_enable`
 
 Tells Puppet whether to enable key-based authentication. Valid options: 'true' or 'false'. Default value: 'false'
 
 ####`keys_file`
 
-Specifies an NTP keys file. Valid options: string containing an absolute path. Default value: '/etc/ntp/keys' (except on AIX, SLES, and Solaris)
+Specifies the complete path and location of the MD5 key file containing the keys and key identifiers used by ntpd, ntpq and ntpdc when operating with symmetric key cryptography. Valid options: string containing an absolute path. Default value: '/etc/ntp/keys' (except on AIX, SLES, and Solaris)
 
 ####`keys_requestkey`
 
-Provides a request key to be used by NTP. Valid options: string. Default value: ' '
+Specifies the key identifier to use with the ntpdc utility program. Valid options: value in the range of 1 to 65,534 inclusive. Default value: ' '
 
 #### `keys_trusted`:
 Provides one or more keys to be trusted by NTP. Valid options: array of keys. Default value: [ ]

spec/acceptance/ntp_parameters_spec.rb

@@ -101,7 +101,7 @@
       class { 'ntp':
         keys_enable     => true,
         keys_file       => '/etc/ntp/keys',
-        keys_controlkey => '/etc/ntp/controlkey',
+        keys_controlkey => '15',
         keys_requestkey => '1',
         keys_trusted    => [ '1', '2' ],
       }
@@ -115,7 +115,7 @@ class { 'ntp':
     describe file("#{config}") do
       it { should be_file }
       its(:content) { should match 'keys /etc/ntp/keys' }
-      its(:content) { should match 'controlkey /etc/ntp/controlkey' }
+      its(:content) { should match 'controlkey 15' }
       its(:content) { should match 'requestkey 1' }
       its(:content) { should match 'trustedkey 1 2' }
     end