summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-16 12:11:22 +0000
committerGerrit Code Review <review@openstack.org>2017-02-16 12:11:22 +0000
commit5340f64c03902b7a76212a579bcc895d56008df3 (patch)
tree6154d5aa7ddc4ba38cc65c78fe08edb7468443fe /puppet
parentb2f43c03d32d291f67a939de70f81ccf30e549ec (diff)
parentb80a89c8411fda1c73dcb6d55805ebe2294b5142 (diff)
Merge "Configuring a default ntp server."
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/time/ntp.yaml6
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/services/time/ntp.yaml b/puppet/services/time/ntp.yaml
index 88ab90cb..b14d7bcc 100644
--- a/puppet/services/time/ntp.yaml
+++ b/puppet/services/time/ntp.yaml
@@ -22,8 +22,10 @@ parameters:
via parameter_defaults in the resource registry.
type: json
NtpServer:
- default: []
- description: NTP servers
+ default: ['pool.ntp.org']
+ description: NTP servers list. Defaulted to pool.ntp.org in order to
+ have a sane default for Pacemaker deployments when
+ not configuring this parameter by default.
type: comma_delimited_list
outputs: