Merge "Add TimeZone parameter for all node types"
authorJenkins <jenkins@review.openstack.org>
Thu, 7 Jan 2016 11:56:58 +0000 (11:56 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 7 Jan 2016 11:56:58 +0000 (11:56 +0000)
1  2 
overcloud.yaml
puppet/compute.yaml
puppet/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp

diff --cc overcloud.yaml
Simple merge
Simple merge
Simple merge