From 19ff638dcd1059fbb09f3b5d931f38f84791ec28 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 7 Aug 2017 20:47:39 +0200 Subject: p/fuel: Fix eth name for enp2s0 (was enp2s2) Previous rebase introduced a regression in VM eth naming on AArch64. enp2s2 should have been enp2s0, so fix that up. Change-Id: If831dffce472750516dfa6b69cdc3a7952a3427d Signed-off-by: Alexandru Avadanii --- ...ses-virtual-AArch64-virtio-NIC-names-sync.patch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'patches') diff --git a/patches/opnfv-fuel/0004-classes-virtual-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0004-classes-virtual-AArch64-virtio-NIC-names-sync.patch index bc4f70f7..812195b7 100644 --- a/patches/opnfv-fuel/0004-classes-virtual-AArch64-virtio-NIC-names-sync.patch +++ b/patches/opnfv-fuel/0004-classes-virtual-AArch64-virtio-NIC-names-sync.patch @@ -5,7 +5,7 @@ Subject: [PATCH] classes: virtual: AArch64: virtio NIC names sync grep -e "ens[[:digit:]]" -R . -l | \ xargs sed -i \ -e 's/ens3/enp1s0/g' \ - -e 's/ens4/enp2s2/g' \ + -e 's/ens4/enp2s0/g' \ -e 's/ens5/enp3s0/g' \ -e 's/ens6/enp4s0/g' @@ -41,7 +41,7 @@ Signed-off-by: Alexandru Avadanii 18 files changed, 48 insertions(+), 48 deletions(-) diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml -index 63e58a2..76c42b5 100644 +index 63e58a2..2f8e94a 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml @@ -27,7 +27,7 @@ parameters: @@ -49,12 +49,12 @@ index 63e58a2..76c42b5 100644 network: interface: - ens4: -+ enp2s2: ++ enp2s0: enabled: true type: eth proto: static diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml -index 6e37978..5140ec5 100644 +index 6e37978..e9e6056 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml @@ -11,7 +11,7 @@ parameters: @@ -62,12 +62,12 @@ index 6e37978..5140ec5 100644 network: interface: - ens4: -+ enp2s2: ++ enp2s0: enabled: true type: eth proto: static diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml -index ba710a3..e29ef08 100644 +index ba710a3..0c1a91f 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml @@ -10,9 +10,9 @@ classes: @@ -77,7 +77,7 @@ index ba710a3..e29ef08 100644 - primary_interface: ens4 - tenant_interface: ens5 - external_interface: ens6 -+ primary_interface: enp2s2 ++ primary_interface: enp2s0 + tenant_interface: enp3s0 + external_interface: enp4s0 interface_mtu: 9000 @@ -93,7 +93,7 @@ index ba710a3..e29ef08 100644 type: eth mtu: ${_param:interface_mtu} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml -index 4d31b09..23abc40 100644 +index 4d31b09..1ea653a 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml @@ -40,13 +40,13 @@ parameters: @@ -101,7 +101,7 @@ index 4d31b09..23abc40 100644 network: interface: - ens4: -+ enp2s2: ++ enp2s0: enabled: true type: eth proto: static @@ -113,7 +113,7 @@ index 4d31b09..23abc40 100644 type: eth proto: static diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml -index fee8097..1e3703c 100644 +index fee8097..f6173d0 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml @@ -6,9 +6,9 @@ classes: @@ -123,7 +123,7 @@ index fee8097..1e3703c 100644 - primary_interface: ens4 - tenant_interface: ens5 - external_interface: ens6 -+ primary_interface: enp2s2 ++ primary_interface: enp2s0 + tenant_interface: enp3s0 + external_interface: enp4s0 interface_mtu: 9000 -- cgit 1.2.3-korg