From dd80103568c275ca8405c5a146a3bb010e1a7fc7 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 22 Jan 2015 15:03:03 -0500 Subject: 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 --- swift-storage-puppet.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'swift-storage-puppet.yaml') diff --git a/swift-storage-puppet.yaml b/swift-storage-puppet.yaml index ba32a81e..26efffdb 100644 --- a/swift-storage-puppet.yaml +++ b/swift-storage-puppet.yaml @@ -44,6 +44,9 @@ parameters: description: The user password for SNMPd with readonly rights running on all Overcloud nodes type: string hidden: true + NtpServer: + type: string + default: '' resources: @@ -114,6 +117,7 @@ resources: swift::storage::all::storage_local_net_ip: {get_input: local_ip} swift_mount_check: {get_input: swift_mount_check } tripleo::ringbuilder::min_part_hours: { get_input: swift_min_part_hours } + ntp::servers: {get_input: ntp_servers} # NOTE(dprince): build_ring support is currently not wired in. # See: https://review.openstack.org/#/c/109225/ tripleo::ringbuilder::build_ring: True @@ -134,6 +138,11 @@ resources: swift_min_part_hours: {get_param: MinPartHours} swift_part_power: {get_param: PartPower} swift_replicas: { get_param: Replicas} + ntp_servers: + str_replace: + template: '["server"]' + params: + server: {get_param: NtpServer} outputs: hosts_entry: -- cgit 1.2.3-korg