Merge "Allow for usage of pre-allocated IPs for the controller nodes"
authorJenkins <jenkins@review.openstack.org>
Fri, 18 Dec 2015 10:22:39 +0000 (10:22 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 18 Dec 2015 10:22:39 +0000 (10:22 +0000)
1  2 
overcloud-resource-registry-puppet.yaml
overcloud.yaml
puppet/controller.yaml

diff --cc overcloud.yaml
Simple merge
Simple merge