Merge "Mv pacemaker and firewall out of controller"
authorJenkins <jenkins@review.openstack.org>
Sat, 3 Sep 2016 12:35:17 +0000 (12:35 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 3 Sep 2016 12:35:17 +0000 (12:35 +0000)
1  2 
overcloud.yaml

diff --cc overcloud.yaml
Simple merge