Merge "composable heat services"
authorJenkins <jenkins@review.openstack.org>
Thu, 26 May 2016 12:26:54 +0000 (12:26 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 26 May 2016 12:26:54 +0000 (12:26 +0000)
commite1d3c42ae970b615c7da138f5b18c8137cbc2f5d
tree29148f0066124b7813caf4922256dc592a122cf5
parentc7d996765ba86d245fb2a4f0ade01142689aafb0
parentd18f21853e2f3be7382a20d0f42232ff3a78b348
Merge "composable heat services"
environments/puppet-pacemaker.yaml
overcloud-resource-registry-puppet.yaml
overcloud.yaml
puppet/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp