Skip to content

Commit

Permalink
Merge pull request redhat-openstack#247 from hunner/TelekomCloud-feat…
Browse files Browse the repository at this point in the history
…ure/no_ulc_by_default

No Undisciplined Local Clock by default
  • Loading branch information
Morgan Haskel committed Feb 26, 2015
2 parents b214c79 + fff6956 commit 6ba70b0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ Tells Puppet what NTP service to manage. Valid options: string. Default value: v

####`udlc`

Specifies whether to configure ntp to use the undisciplined local clock as a time source, regardless of the node's status as a virtual machine. Valid options: 'true' or 'false'. Default value: 'false' for VMs and 'true' otherwise.
Specifies whether to configure ntp to use the undisciplined local clock as a time source. Valid options: 'true' or 'false'. Default value: 'false'

##Limitations

Expand Down
10 changes: 1 addition & 9 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
$service_enable = true
$service_ensure = 'running'
$service_manage = true
$udlc = false
$interfaces = []
$disable_auth = false
$broadcastclient = false
Expand All @@ -28,15 +29,6 @@
default => true,
}

# On virtual systems, disable the use of the undisciplined local clock to
# avoid ntp falling back to the local clock in preference over ntp servers.
# TODO Change this to str2bool($::is_virtual) when stdlib dependency is >= 4
# NOTE The "x${var}" is just to avoid lint quoted variable warning.
$udlc = "x${::is_virtual}" ? {
'xtrue' => false,
default => true,
}

$default_config = '/etc/ntp.conf'
$default_keys_file = '/etc/ntp/keys'
$default_driftfile = '/var/lib/ntp/drift'
Expand Down

0 comments on commit 6ba70b0

Please sign in to comment.