Merge "Sahara Integration"
authorJenkins <jenkins@review.openstack.org>
Tue, 12 Jan 2016 17:31:04 +0000 (17:31 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 12 Jan 2016 17:31:04 +0000 (17:31 +0000)
commitc662d0f7cc2286b038e0a04f12507322fd2ba78f
tree53ee3e045979c475a2a114be8ae711224b85df0b
parent31b05b17bfd028d16990231079c4bfde777cde40
parentd69868ea9eec3d1f0a59b1fd6635a2c14df6e609
Merge "Sahara Integration"
overcloud.yaml
puppet/controller.yaml
puppet/hieradata/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp