diff options
author | 2015-01-22 15:03:03 -0500 | |
---|---|---|
committer | 2015-02-04 09:33:13 -0500 | |
commit | dd80103568c275ca8405c5a146a3bb010e1a7fc7 (patch) | |
tree | edc59645939b33a806a851106ca49c600a8ab5e1 /controller-puppet.yaml | |
parent | a536d3c8887b99c3b6e270c2e6c2469e4241eb7a (diff) |
Puppet: Ntp support
This patch adds NTP support to all roles.
As part of this change overcloud-without-mergepy.yaml has
also been updated so that it passes the NtpServer parameters into
the Swift and Cinder storage node templates so that Ntp can
also be configured on those machines as well.
NOTE: The puppet support here uses the puppetlabs-ntp modules
which we add in Ib10ccbfdb3140b19f40049707548c6655d250e1c.
Change-Id: If2ef236fa42a714e84c6944eee5fe4daddf3fedf
Diffstat (limited to 'controller-puppet.yaml')
-rw-r--r-- | controller-puppet.yaml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/controller-puppet.yaml b/controller-puppet.yaml index 8b8a4eff..62fe2f1f 100644 --- a/controller-puppet.yaml +++ b/controller-puppet.yaml @@ -524,7 +524,11 @@ resources: rabbit_cookie: {get_param: RabbitCookie} rabbit_client_use_ssl: {get_param: RabbitClientUseSSL} rabbit_client_port: {get_param: RabbitClientPort} - ntp_server: {get_param: NtpServer} + ntp_servers: + str_replace: + template: '["server"]' + params: + server: {get_param: NtpServer} control_virtual_interface: {get_param: ControlVirtualInterface} public_virtual_interface: {get_param: PublicVirtualInterface} public_virtual_ip: {get_param: PublicVirtualIP} @@ -685,7 +689,7 @@ resources: rabbit_client_port: {get_input: rabbit_client_port} # Misc neutron_public_interface_ip: {get_input: neutron_public_interface_ip} - ntp_server: {get_input: ntp_server} + ntp::servers: {get_input: ntp_servers} control_virtual_interface: {get_input: control_virtual_interface} controller_virtual_ip: {get_input: controller_virtual_ip} public_virtual_interface: {get_input: public_virtual_interface} |