Merge "Composable roles within services - NTP"
authorJenkins <jenkins@review.openstack.org>
Tue, 21 Jun 2016 16:19:30 +0000 (16:19 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 21 Jun 2016 16:19:30 +0000 (16:19 +0000)
commita2614491be1cae82e4b04337184b75644633ce3f
treeba4cf25e3c25c770f5cb0296c3ce816b13d9a94a
parentd6eec7809a57e21faea1737a0339e1f84b96b28a
parent296bffde893dbbf36c62d664e24e2584b89b8070
Merge "Composable roles within services - NTP"
overcloud-resource-registry-puppet.yaml
overcloud.yaml
puppet/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp