aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
diff options
context:
space:
mode:
authorYanis Guenane <yguenane@redhat.com>2015-10-07 17:06:45 +0200
committerYanis Guenane <yguenane@redhat.com>2015-10-15 09:45:58 +0200
commit16093c3932545b1a8d1f4572c98d6953c277b3d5 (patch)
tree4c7a5a90fb2836fd7a88e4de07622f4c4233d71c /puppet/controller.yaml
parente161d63e0f5d2c2e6f4b0f52449d6a4b5e1d8ea0 (diff)
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
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml9
1 files changed, 3 insertions, 6 deletions
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}