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/ceph-storage.yaml | |
parent | 382a9809d7c589e0702af6f43a1b263fad02459f (diff) | |
parent | d2c375bad7e8fb71618c6ebb77712fb5b8d0bc13 (diff) |
Merge "Add TimeZone parameter for all node types"
Diffstat (limited to 'puppet/ceph-storage.yaml')
-rw-r--r-- | puppet/ceph-storage.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index ede1263b..3044d975 100644 --- a/puppet/ceph-storage.yaml +++ b/puppet/ceph-storage.yaml @@ -34,6 +34,10 @@ parameters: description: Mapping of service_name -> network name. Typically set via parameter_defaults in the resource registry. type: json + TimeZone: + default: 'UTC' + description: The timezone to be set on Ceph nodes. + type: string UpdateIdentifier: default: '' type: string @@ -198,6 +202,7 @@ resources: server: {get_resource: CephStorage} input_values: ntp_servers: {get_param: NtpServer} + timezone: {get_param: TimeZone} enable_package_install: {get_param: EnablePackageInstall} enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} ceph_cluster_network: {get_attr: [NetIpSubnetMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]} @@ -229,6 +234,7 @@ resources: raw_data: {get_file: hieradata/ceph.yaml} mapped_data: ntp::servers: {get_input: ntp_servers} + timezone::timezone: {get_input: timezone} tripleo::packages::enable_install: {get_input: enable_package_install} tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade} ceph::profile::params::cluster_network: {get_input: ceph_cluster_network} |