Merge "Basic support for deploying Ironic in overcloud"

author Jenkins <jenkins@review.openstack.org>

Thu, 30 Jun 2016 14:24:43 +0000 (14:24 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 30 Jun 2016 14:24:43 +0000 (14:24 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 30 Jun 2016 14:24:43 +0000 (14:24 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 30 Jun 2016 14:24:43 +0000 (14:24 +0000)
diff --cc overcloud-resource-registry-puppet.yaml
Simple merge
diff --cc overcloud.yaml
Simple merge
diff --cc puppet/controller.yaml
Simple merge
diff --cc puppet/hieradata/database.yaml
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 30 Jun 2016 14:24:43 +0000 (14:24 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 30 Jun 2016 14:24:43 +0000 (14:24 +0000)
		1	2
overcloud-resource-registry-puppet.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
overcloud.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/controller.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/hieradata/database.yaml	patch \|	diff1 \|	diff2 \|	blob \| history