From bda4548f2db6b87136c3a29f042d9e3341ec18ac Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 8 Oct 2017 14:26:24 +0200 Subject: 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 (cherry picked from commit db2144a7f6ed8586bbab39fdb5ea15b171388e85) --- mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml index c13c47514..ae2ae4b42 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml @@ -115,10 +115,10 @@ parameters: virt: nic: default: - - name: ${_param:deploy_nic} + eth1: bridge: br-mgmt model: virtio - - name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} + eth0: bridge: br-ctl model: virtio glusterfs: -- cgit 1.2.3-korg