Update ntp to ca6bbcf

ca6bbcf Merge pull request redhat-openstack#262 from bmjen/fix-rhel-ci
04d195c adds fix for redhat to disable ntp restart due to dhcp ntp server updates
94ccfd2 Merge pull request redhat-openstack#261 from bmjen/fix-acceptance-tests
bc136ef fixes debian-based flakiness in acceptance tests

Change-Id: I4f67d17254cfa530119edb1e4734eafc4958e385

Puppetfile

@@ -131,7 +131,7 @@ mod 'nssdb',
   :git => 'https://github.com/rcritten/puppet-nssdb.git'
 
 mod 'ntp',
-  :commit => '060c453a9bbd87d1bf229db70ee6367033a2910e',
+  :commit => 'ca6bbcfbd2ff44e1a4abef8b91a8339a5b0b878c',
   :git => 'https://github.com/puppetlabs/puppetlabs-ntp'
 
 mod 'openstack_extras',

ntp/spec/spec_helper_acceptance.rb

@@ -24,6 +24,14 @@
     else
       on host, puppet('module install puppetlabs-stdlib'), {:acceptable_exit_codes => [0, 1]}
     end
+
+    #Need to disable update of ntp servers from DHCP, as subsequent restart of ntp causes test failures
+    if fact('osfamily') == 'Debian'
+      shell('[[ -f /etc/dhcp/dhclient-exit-hooks.d/ntp ]] && rm /etc/dhcp/dhcp-exit-hooks.d/ntp', { :acceptable_exit_codes => [0, 1] })
+      shell('[[ -f /etc/dhcp3/dhclient-exit-hooks.d/ntp ]] && rm /etc/dhcp3/dhcp-exit-hooks.d/ntp', { :acceptable_exit_codes => [0, 1] })
+    elsif fact('osfamily') == 'RedHat'
+      shell('echo "PEERNTP=no" >> /etc/sysconfig/network', { :acceptable_exit_codes => [0, 1]})
+    end
   end
 end