diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-08 14:26:24 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-11 17:54:43 +0000 |
| commit | bda4548f2db6b87136c3a29f042d9e3341ec18ac (patch) | |
| tree | 15722f32f2ed37296fb87675cf5f2770ca094d8a /mcp | |
| parent | 186e1ca5b3ee1b0b76e5d6ddecfee0a94bae45fd (diff) | |
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)
Diffstat (limited to 'mcp')
3 files changed, 6 insertions, 6 deletions
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: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml index fedae85c6..4b9816bc9 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml @@ -104,10 +104,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: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml index 63fdd7a71..ab802c6a4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml @@ -105,10 +105,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: |