diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-01-07 11:56:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-01-07 11:56:58 +0000 |
| commit | 1e157766e4430aed80526056ede19d22c03ee5f3 (patch) | |
| tree | b8bc3e44f460aa9a3e1bd1c65b820bb0bd75e956 /puppet/controller.yaml | |
| parent | 382a9809d7c589e0702af6f43a1b263fad02459f (diff) | |
| parent | d2c375bad7e8fb71618c6ebb77712fb5b8d0bc13 (diff) | |
Merge "Add TimeZone parameter for all node types"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 8e90114b..e7d2f572 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -617,6 +617,10 @@ parameters: default: 0 description: Number of workers for Swift service. type: number + TimeZone: + default: 'UTC' + description: The timezone to be set on controller nodes. + type: string VirtualIP: # DEPRECATED: use per service settings instead type: string default: '' # Has to be here because of the ignored empty value bug @@ -1099,6 +1103,7 @@ resources: params: LIMIT: {get_param: RabbitFDLimit} ntp_servers: {get_param: NtpServer} + timezone: {get_param: TimeZone} control_virtual_interface: {get_param: ControlVirtualInterface} public_virtual_interface: {get_param: PublicVirtualInterface} swift_hash_suffix: {get_param: SwiftHashSuffix} @@ -1463,6 +1468,7 @@ resources: memcached::listen_ip: {get_input: memcached_network} neutron_public_interface_ip: {get_input: neutron_public_interface_ip} ntp::servers: {get_input: ntp_servers} + timezone::timezone: {get_input: timezone} control_virtual_interface: {get_input: control_virtual_interface} public_virtual_interface: {get_input: public_virtual_interface} tripleo::loadbalancer::control_virtual_interface: {get_input: control_virtual_interface} |