Merge "Revert "Revert "Blacklist support for ExtraConfig"""

author Jenkins <jenkins@review.openstack.org>

Thu, 13 Jul 2017 04:08:29 +0000 (04:08 +0000)

committer Gerrit Code Review <review@openstack.org>

Thu, 13 Jul 2017 04:08:30 +0000 (04:08 +0000)
author Jenkins <jenkins@review.openstack.org>
Thu, 13 Jul 2017 04:08:29 +0000 (04:08 +0000)
committer Gerrit Code Review <review@openstack.org>
Thu, 13 Jul 2017 04:08:30 +0000 (04:08 +0000)
diff --cc puppet/blockstorage-role.yaml
Simple merge
diff --cc puppet/cephstorage-role.yaml
Simple merge
diff --cc puppet/compute-role.yaml
Simple merge
diff --cc puppet/controller-role.yaml
Simple merge
diff --cc puppet/objectstorage-role.yaml
Simple merge
diff --cc puppet/role.role.j2.yaml
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Thu, 13 Jul 2017 04:08:29 +0000 (04:08 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Thu, 13 Jul 2017 04:08:30 +0000 (04:08 +0000)
		1	2
puppet/blockstorage-role.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/cephstorage-role.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/compute-role.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/controller-role.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/objectstorage-role.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/role.role.j2.yaml	patch \|	diff1 \|	diff2 \|	blob \| history