Merge "Allow a user to specify a comma separated list of ntp servers"

1 files changed, 3 insertions, 6 deletions

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 4504428d..af673d7a 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -458,8 +458,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.
@@ -967,11 +968,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}