Merge "OpenContrail heat templates"
authorJenkins <jenkins@review.openstack.org>
Mon, 29 Feb 2016 15:31:51 +0000 (15:31 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 29 Feb 2016 15:31:51 +0000 (15:31 +0000)
commit6677663e1141c1baabb0769191a7f951abe0c66d
tree3f51ee76c267a45e80da32328c8e70c3a92ba959
parent1e5e9b172c02bbaa49d3176cfecbe40cccad74f2
parentfd922970e86d62d3da7ea5bbde37418fdbcb248e
Merge "OpenContrail heat templates"
puppet/compute.yaml
puppet/controller.yaml
puppet/manifests/overcloud_compute.pp
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp