[baremetal] Fix cmp proto dhcp on PXE/admin 37/51137/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 21 Jan 2018 17:28:03 +0000 (18:28 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Thu, 25 Jan 2018 17:30:52 +0000 (18:30 +0100)
commit486fb378c616934e3c8c3da4e47fd41801b4b421
tree89a5d52b83a0d52caa02c6424c062dc646b5808f
parent82050de5fa77139d8e117683cb3c0084e5b7f250
[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>
(cherry picked from commit 19913423a73f5913f7aa12a0737b2d2d36639efe)
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_pdf.yml.j2
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_pdf.yml.j2