Merge "[baremetal] Fixup pike deployment"

author Alexandru Avadanii <Alexandru.Avadanii@enea.com>

Mon, 11 Dec 2017 17:15:05 +0000 (17:15 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Mon, 11 Dec 2017 17:15:05 +0000 (17:15 +0000)
author Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Mon, 11 Dec 2017 17:15:05 +0000 (17:15 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Mon, 11 Dec 2017 17:15:05 +0000 (17:15 +0000)
diff --cc mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
Simple merge
diff --cc mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml
Simple merge
author	Alexandru Avadanii <Alexandru.Avadanii@enea.com>
	Mon, 11 Dec 2017 17:15:05 +0000 (17:15 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Mon, 11 Dec 2017 17:15:05 +0000 (17:15 +0000)
		1	2
mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml	patch \|	diff1 \|	diff2 \|	blob \| history
mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml	patch \|	diff1 \|	diff2 \|	blob \| history