diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-11-11 10:44:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-11-11 10:44:05 +0000 |
| commit | 7961f61a413eb36caf46677655cbf8af8bfb6303 (patch) | |
| tree | d17b48d19cff2071e349d9fa705898bb2d719908 /puppet/compute.yaml | |
| parent | adefda09c02b6d0b6fe2bfd68513e03924bc028d (diff) | |
| parent | 16093c3932545b1a8d1f4572c98d6953c277b3d5 (diff) | |
Merge "Allow a user to specify a comma separated list of ntp servers"
Diffstat (limited to 'puppet/compute.yaml')
| -rw-r--r-- | puppet/compute.yaml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 2b635357..07638fb9 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -219,8 +219,9 @@ parameters: type: string default: '' # Has to be here because of the ignored empty value bug NtpServer: - type: string default: '' + description: Comma-separated list of ntp servers + type: comma_delimited_list RabbitHost: type: string default: '' # Has to be here because of the ignored empty value bug @@ -547,11 +548,7 @@ resources: rabbit_password: {get_param: RabbitPassword} rabbit_client_use_ssl: {get_param: RabbitClientUseSSL} rabbit_client_port: {get_param: RabbitClientPort} - ntp_servers: - str_replace: - template: '["server"]' - params: - server: {get_param: NtpServer} + ntp_servers: {get_param: NtpServer} enable_package_install: {get_param: EnablePackageInstall} enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} |