reclass: Revert virt.nic to hardcoded eth{0,1} 21/44821/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 8 Oct 2017 12:26:24 +0000 (14:26 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 11 Oct 2017 17:54:43 +0000 (17:54 +0000)
commitbda4548f2db6b87136c3a29f042d9e3341ec18ac
tree15722f32f2ed37296fb87675cf5f2770ca094d8a
parent186e1ca5b3ee1b0b76e5d6ddecfee0a94bae45fd
reclass: Revert virt.nic to hardcoded eth{0,1}

Salt's virtualization model for virt:nic:default does not use real
interface names that are present on the node, but instead it defaults
to using "ethX" notation, that name being only a convention inside
Salt internals.

Moreover, the 'salt.control.virt' reclass class (located in
/srv/salt/reclass/classes/system/salt/control) already provides a
defalt maping between "eth{0,1}" and "br{0,1}". Using anything
different than "eth{0,1}" will lead to 2 extra (broken) mappings.

Reverting the changes in "virt:nic" reclass fixes both the python
exception recently introduced, as well as the broken defaults.

Change-Id: I5c90e3d2bc181c1ad3d87af64440439e6a41fb28
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit db2144a7f6ed8586bbab39fdb5ea15b171388e85)
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml