Merge "[baremetal] MaaS: Remove curtin netconfig via Salt"

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

Fri, 17 Nov 2017 12:20:24 +0000 (12:20 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 17 Nov 2017 12:20:24 +0000 (12:20 +0000)
author Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Fri, 17 Nov 2017 12:20:24 +0000 (12:20 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 17 Nov 2017 12:20:24 +0000 (12:20 +0000)
diff --cc mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
Simple merge
diff --cc mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
Simple merge
author	Alexandru Avadanii <Alexandru.Avadanii@enea.com>
	Fri, 17 Nov 2017 12:20:24 +0000 (12:20 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 17 Nov 2017 12:20:24 +0000 (12:20 +0000)
		1	2
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml	patch \|	diff1 \|	diff2 \|	blob \| history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml	patch \|	diff1 \|	diff2 \|	blob \| history