Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Enable Docker service for Compute role"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
time
/
ntp.yaml
diff --git
a/puppet/services/time/ntp.yaml
b/puppet/services/time/ntp.yaml
index
59d25dd
..
b14d7bc
100644
(file)
--- a/
puppet/services/time/ntp.yaml
+++ b/
puppet/services/time/ntp.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-04-08
+heat_template_version:
ocata
description: >
NTP service deployment using puppet, this YAML file
description: >
NTP service deployment using puppet, this YAML file
@@
-7,14
+7,25
@@
description: >
and configure NTP.
parameters:
and configure NTP.
parameters:
+ ServiceNetMap:
+ default: {}
+ description: Mapping of service_name -> network name. Typically set
+ via parameter_defaults in the resource registry. This
+ mapping overrides those in ServiceNetMapDefaults.
+ type: json
+ DefaultPasswords:
+ default: {}
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
NtpServer:
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
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:
type: comma_delimited_list
outputs:
@@
-23,10
+34,10
@@
outputs:
value:
service_name: ntp
config_settings:
value:
service_name: ntp
config_settings:
- ntp::
ntp
servers: {get_param: NtpServer}
+ ntp::servers: {get_param: NtpServer}
tripleo.ntp.firewall_rules:
'105 ntp':
dport: 123
proto: udp
step_config: |
tripleo.ntp.firewall_rules:
'105 ntp':
dport: 123
proto: udp
step_config: |
- include ::ntp
+ include ::
tripleo::profile::base::time::
ntp