Merge pull request #22 from joshuabaird/ntp_support

Add $ntp:: param for --no-ntp support

Gemfile

@@ -7,3 +7,4 @@ gem 'rspec-puppet', '< 1.0.0'
 gem 'ruby-augeas'
 gem 'puppet-lint', '>= 1'
 gem 'puppet-blacksmith', '>= 3.1.0', {"groups"=>["development"]}
+gem 'rspec', '~> 3.1.0'

manifests/init.pp

@@ -26,6 +26,9 @@
 # $mkhomedir::             Automatically make /home/<user> or not
 #                          Default: true
 #
+# $ntp::                   Manage and configure ntpd?
+#                          Default: true
+#
 # $options::               Additional command-line options to pass directly to
 #                          installer
 #
@@ -83,6 +86,7 @@
   $fixed_primary      = $ipaclient::params::fixed_primary,
   $installer          = $ipaclient::params::installer,
   $mkhomedir          = $ipaclient::params::mkhomedir,
+  $ntp                = $ipaclient::params::ntp,
   $options            = $ipaclient::params::options,
   $package            = $ipaclient::params::package,
   $password           = $ipaclient::params::password,
@@ -150,10 +154,16 @@
         $opt_mkhomedir = ''
       }
 
+      if !str2bool($ntp) {
+        $opt_ntp = '--no-ntp'
+      } else {
+        $opt_ntp = ''
+      }
+
       # Flatten the arrays, delete empty options, and shellquote everything
       $command = shellquote(delete(flatten([$installer,$opt_realm,$opt_password,
                             $opt_principal,$opt_mkhomedir,$opt_domain,
-                            $opt_server,$opt_fixed_primary,$opt_ssh,$options,
+                            $opt_server,$opt_fixed_primary,$opt_ssh,$opt_ntp,$options,
                             '--force','--unattended']), ''))
 
       exec { 'ipa_installer':

manifests/params.pp

@@ -19,6 +19,7 @@
   $installer      = '/usr/sbin/ipa-client-install'
   $automount_location = ''
   $automount_server   = ''
+  $ntp            = true
 
   # Name of IPA package to install
   case $::osfamily {

spec/classes/ipaclient_spec.rb

@@ -93,7 +93,8 @@
         :realm     => "PIXIEDUST.COM",
         :sudo      => false,
         :automount => true,
-        :automount_location => 'home'
+        :automount_location => 'home',
+        :ntp => false
       } end
 
       it "should install the right package" do
@@ -103,7 +104,7 @@
       end
 
       it "should generate the correct command" do
-        should contain_exec('ipa_installer').with_command("/usr/sbin/ipa-client-install --realm PIXIEDUST.COM --password unicorns --principal [email protected] --domain pixiedust.com --server ipa01.pixiedust.com --force --unattended")
+        should contain_exec('ipa_installer').with_command("/usr/sbin/ipa-client-install --realm PIXIEDUST.COM --password unicorns --principal [email protected] --domain pixiedust.com --server ipa01.pixiedust.com --no-ntp --force --unattended")
       end
 
       it "should not configure sudoers" do