[baremetal] Fix cmp proto dhcp on PXE/admin 79/50879/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 21 Jan 2018 17:28:03 +0000 (18:28 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 21 Jan 2018 17:31:03 +0000 (18:31 +0100)
commit19913423a73f5913f7aa12a0737b2d2d36639efe
tree5488de8f0a66eaf728ca6a4739a485f6128b739e
parentd06bcfb72c44b507c3efee4de00f415869f48450
[baremetal] Fix cmp proto dhcp on PXE/admin

Although we properly filter the PXE/admin interface in the common
openstack_compute_pdf.yml.j2 template and use DHCP instead of manual
setup, we failed to do the same in scenario-specific overrides
(ODL, OVS), so we end up with 'proto: manual' on PXE/admin on cmp
nodes.

The fix is trivial and reuses the mechanism in the common class in
scenario-specific templates (if interface is PXE/admin, use 'DHCP'
instead of 'manual').

This solves the issue of broken connectivity to Salt master after
cmp reboot.

Change-Id: I1953d03343190acb2efcab4412a3d37e130b0ea9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2