From 16093c3932545b1a8d1f4572c98d6953c277b3d5 Mon Sep 17 00:00:00 2001
From: Yanis Guenane <yguenane@redhat.com>
Date: Wed, 7 Oct 2015 17:06:45 +0200
Subject: Allow a user to specify a comma separated list of ntp servers

This commits aims to allow a user to specify several ntp servers and not
just one.

Example:

openstack overcloud deploy --templates --ntp-server
0.centos.pool.org,1.centos.pool.org

Change-Id: I4925ef1cf1e565d789981e609c88a07b6e9b28de
---
 puppet/controller.yaml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'puppet/controller.yaml')

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index fe96236e..1a7b117c 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -421,8 +421,9 @@ parameters:
     description: Should MongoDb journaling be disabled
     type: boolean
   NtpServer:
-    type: string
     default: ''
+    description: Comma-separated list of ntp servers
+    type: comma_delimited_list
   PcsdPassword:
     type: string
     description: The password for the 'pcsd' user.
@@ -910,11 +911,7 @@ resources:
             template: "'LIMIT'"
             params:
               LIMIT: {get_param: RabbitFDLimit}
-        ntp_servers:
-          str_replace:
-            template: '["server"]'
-            params:
-              server: {get_param: NtpServer}
+        ntp_servers: {get_param: NtpServer}
         control_virtual_interface: {get_param: ControlVirtualInterface}
         public_virtual_interface: {get_param: PublicVirtualInterface}
         swift_hash_suffix: {get_param: SwiftHashSuffix}
-- 
cgit 1.2.3-korg