Merge "Fix barbican integration on compute nodes"

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

Thu, 16 Aug 2018 15:37:06 +0000 (15:37 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 16 Aug 2018 15:37:06 +0000 (15:37 +0000)
author Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Thu, 16 Aug 2018 15:37:06 +0000 (15:37 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 16 Aug 2018 15:37:06 +0000 (15:37 +0000)
diff --cc mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
Simple merge
diff --cc mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
Simple merge
author	Alexandru Avadanii <Alexandru.Avadanii@enea.com>
	Thu, 16 Aug 2018 15:37:06 +0000 (15:37 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 16 Aug 2018 15:37:06 +0000 (15:37 +0000)
		1	2
mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2	patch \|	diff1 \|	diff2 \|	blob \| history
mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml	patch \|	diff1 \|	diff2 \|	blob \| history