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/manifests/overcloud_controller_pacemaker.pp | |
| parent | 382a9809d7c589e0702af6f43a1b263fad02459f (diff) | |
| parent | d2c375bad7e8fb71618c6ebb77712fb5b8d0bc13 (diff) | |
Merge "Add TimeZone parameter for all node types"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index df89625f..943e7fce 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -41,6 +41,8 @@ if hiera('step') >= 1 { create_resources(sysctl::value, hiera('sysctl_settings'), {}) + include ::timezone + if count(hiera('ntp::servers')) > 0 { include ::ntp } |