Closed Bug 1376804 Opened 8 years ago Closed 8 years ago

Fix ntp::atboot for osx

Categories

(Infrastructure & Operations :: RelOps: Puppet, task)

task
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: dividehex, Assigned: dragrom)

Details

Attachments

(1 file)

During the firewall meeting, it was discovered that osx hosts in the test vlan are connecting to time.apple.com. ntp should not be running on these hosts and definitely should not be contacting apple for ntp.
Status: NEW → ASSIGNED
Fix ntp::atboot for OSX, to call ntpdate instead to use ntp service
Attachment #8882023 - Flags: review?(jwatkins)
Comment on attachment 8882023 [details] [diff] [review] Bug_1376804_Fix_ntp_atboot_for_OSX.patch Review of attachment 8882023 [details] [diff] [review]: ----------------------------------------------------------------- r+ on the changes mentioned below. Make sure you don't change daemon.pp. All this code is still valid. ::: modules/ntp/manifests/atboot.pp @@ +17,5 @@ > } > + Darwin: { > + file { > + '/Library/LaunchDaemons/org.mozilla.ntpdate.plist': > + content => template('ntp/ntp.plist.erb'); this template should be named ntpdate.plist.erb. Ntp(ntpd) is not the same as ntpdate ::: modules/ntp/manifests/daemon.pp @@ -53,5 @@ > - cron { > - 'whack-apple-ntpd': > - command => '/usr/bin/killall ntpd', > - minute => 0; > - } None of this code should be removed in daemon.pp; it is still all valid. We are only fixing ntp::atboot ::: modules/ntp/templates/ntp.plist.erb @@ +9,5 @@ > + <key>Program</key> > + <string>/usr/sbin/ntpdate</string> > + <key>ProgramArguments</key> > + <array> > + <string>/usr/sbin/ntpdate</string> Trailing whitespace
Attachment #8882023 - Flags: review?(jwatkins) → review+
Status: ASSIGNED → RESOLVED
Closed: 8 years ago
Resolution: --- → FIXED
I backed the change out because it landed without including the review changes: https://hg.mozilla.org/build/puppet/rev/41834c9630af
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Attachment #8882023 - Flags: checked-in+ → checked-in-
I don't see what review changes I didn't applied: - modules/ntp/manifests/atboot.pp - this template should be named ntpdate.plist.erb. Ntp(ntpd) is not the same as ntpdate - was applied - modules/ntp/templates/ntp.plist.erb - Trailing whitespace - renamed ntp.plist.erb to ntpdate.plist.erb and removed Trailing whitespace from the end of <string>/usr/sbin/ntpdate</string> line - modules/ntp/manifests/daemon.pp - None of this code should be removed in daemon.pp; it is still all valid. We are only fixing ntp::atboot - so I reverted the changes from daemon.pp and kept the default code. From this reason daemon.pp bot appear in the commit, because there are no changes.
Flags: needinfo?(nthomas)
I'm really sorry, somehow I completely misread the patch that actually landed. Please go ahead and reland it. Would be great if we could stick to our rule about merging to production as soon as travis-ci is green on pushes to default.
Flags: needinfo?(nthomas)
Attachment #8882023 - Flags: checked-in- → checked-in+
Status: REOPENED → RESOLVED
Closed: 8 years ago8 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: