From c5bfbf1f4bababbbf885414d0c6bdd9f01cae900 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 29 Jul 2017 00:24:04 +0200 Subject: p/fuel: Rebase, drop upstream clone Now that Fuel@OPNFV supports submodule patching again, bring back `make fuel-patches-import`. Change-Id: Ic6f9870d94b6d302f1ebcdc21d54a83f62910af9 Signed-off-by: Alexandru Avadanii --- ...ses-virtual-AArch64-virtio-NIC-names-sync.patch | 322 --------------------- 1 file changed, 322 deletions(-) delete mode 100644 patches/opnfv-fuel/0006-classes-virtual-AArch64-virtio-NIC-names-sync.patch (limited to 'patches/opnfv-fuel/0006-classes-virtual-AArch64-virtio-NIC-names-sync.patch') diff --git a/patches/opnfv-fuel/0006-classes-virtual-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0006-classes-virtual-AArch64-virtio-NIC-names-sync.patch deleted file mode 100644 index 2c64459b..00000000 --- a/patches/opnfv-fuel/0006-classes-virtual-AArch64-virtio-NIC-names-sync.patch +++ /dev/null @@ -1,322 +0,0 @@ -From: Alexandru Avadanii -Date: Tue, 25 Jul 2017 02:53:16 +0200 -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/ens5/enp3s0/g' \ - -e 's/ens6/enp4s0/g' - -Since AArch64 will be using virtio-net-pci NIC model for guests, -predictable interface naming yields a slightly different scheme. - -Update all configuration to reflect this. - -NOTE: Above configuration is expected with libvirt 3.x, which puts -each NIC on a separate PCIe bus (which also imposes virtio modern -is used). - -Signed-off-by: Alexandru Avadanii ---- - .../classes/cluster/virtual-mcp-ocata-odl/infra/config.yml | 2 +- - .../cluster/virtual-mcp-ocata-odl/opendaylight/control.yml | 2 +- - .../classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml | 8 ++++---- - .../classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml | 4 ++-- - .../classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml | 8 ++++---- - .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml | 6 +++--- - .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml | 8 ++++---- - .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml | 4 ++-- - .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml | 8 ++++---- - .../classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml | 2 +- - .../classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml | 8 ++++---- - .../classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml | 4 ++-- - .../classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml | 8 ++++---- - 13 files changed, 36 insertions(+), 36 deletions(-) - -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml -index 328d6df..57c6cec 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml -@@ -27,7 +27,7 @@ parameters: - linux: - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml -index 6c6640a..ec02e94 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml -@@ -11,7 +11,7 @@ parameters: - linux: - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml -index 97eda6c..3f18ccd 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml -@@ -10,9 +10,9 @@ classes: - - cluster.virtual-mcp-ocata-odl - parameters: - _param: -- primary_interface: ens4 -- tenant_interface: ens5 -- external_interface: ens6 -+ primary_interface: enp2s0 -+ tenant_interface: enp3s0 -+ external_interface: enp4s0 - interface_mtu: 9000 - linux_system_codename: xenial - loopback_device_size: 10 -@@ -52,7 +52,7 @@ parameters: - interface: - dhcp_int: - enabled: true -- name: ens3 -+ name: enp1s0 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml -index 17c22c5..ca3a812 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml -@@ -40,13 +40,13 @@ parameters: - version: latest - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 -- ens6: -+ enp4s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml -index 4ea51f3..ee17dbd 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml -@@ -6,9 +6,9 @@ classes: - - cluster.virtual-mcp-ocata-odl - parameters: - _param: -- primary_interface: ens4 -- tenant_interface: ens5 -- external_interface: ens6 -+ primary_interface: enp2s0 -+ tenant_interface: enp3s0 -+ external_interface: enp4s0 - interface_mtu: 9000 - linux_system_codename: xenial - neutron_agents: -@@ -32,7 +32,7 @@ parameters: - interface: - dhcp_int: - enabled: true -- name: ens3 -+ name: enp1s0 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml -index 864c71d..aec6cde 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml -@@ -26,7 +26,7 @@ parameters: - linux: - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static -@@ -51,14 +51,14 @@ parameters: - single_address: 172.16.10.105 - tenant_address: 10.1.0.105 - external_address: 10.16.0.105 -- dpdk0_name: ens5 -+ dpdk0_name: enp3s0 - dpdk0_pci: '"0000:00:05.0"' - openstack_compute_node02: - params: - single_address: 172.16.10.106 - tenant_address: 10.1.0.106 - external_address: 10.16.0.106 -- dpdk0_name: ens5 -+ dpdk0_name: enp3s0 - dpdk0_pci: '"0000:00:05.0"' - openstack_gateway_node01: - params: -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml -index c23ca7f..6d2f724 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml -@@ -12,9 +12,9 @@ classes: - - cluster.virtual-mcp-ocata-ovs-dpdk - parameters: - _param: -- primary_interface: ens4 -- tenant_interface: ens5 -- external_interface: ens6 -+ primary_interface: enp2s0 -+ tenant_interface: enp3s0 -+ external_interface: enp4s0 - interface_mtu: 9000 - linux_system_codename: xenial - loopback_device_size: 10 -@@ -51,7 +51,7 @@ parameters: - interface: - dhcp_int: - enabled: true -- name: ens3 -+ name: enp1s0 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml -index b85f085..20eb8f5 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml -@@ -40,13 +40,13 @@ parameters: - version: latest - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 -- ens6: -+ enp4s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml -index e102c10..f153a19 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml -@@ -6,9 +6,9 @@ classes: - - cluster.virtual-mcp-ocata-ovs-dpdk - parameters: - _param: -- primary_interface: ens4 -- tenant_interface: ens5 -- external_interface: ens6 -+ primary_interface: enp2s0 -+ tenant_interface: enp3s0 -+ external_interface: enp4s0 - interface_mtu: 9000 - linux_system_codename: xenial - neutron: -@@ -22,7 +22,7 @@ parameters: - interface: - dhcp_int: - enabled: true -- name: ens3 -+ name: enp1s0 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml -index 97730b1..8cb0992 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml -@@ -26,7 +26,7 @@ parameters: - linux: - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml -index a86a7c6..0469fa0 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml -@@ -10,9 +10,9 @@ classes: - - cluster.virtual-mcp-ocata-ovs - parameters: - _param: -- primary_interface: ens4 -- tenant_interface: ens5 -- external_interface: ens6 -+ primary_interface: enp2s0 -+ tenant_interface: enp3s0 -+ external_interface: enp4s0 - interface_mtu: 9000 - linux_system_codename: xenial - loopback_device_size: 10 -@@ -47,7 +47,7 @@ parameters: - interface: - dhcp_int: - enabled: true -- name: ens3 -+ name: enp1s0 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml -index ae103cd..350b618 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml -@@ -40,13 +40,13 @@ parameters: - version: latest - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 -- ens6: -+ enp4s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml -index 9257d86..26b0e4c 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml -@@ -6,9 +6,9 @@ classes: - - cluster.virtual-mcp-ocata-ovs - parameters: - _param: -- primary_interface: ens4 -- tenant_interface: ens5 -- external_interface: ens6 -+ primary_interface: enp2s0 -+ tenant_interface: enp3s0 -+ external_interface: enp4s0 - interface_mtu: 9000 - linux_system_codename: xenial - neutron: -@@ -20,7 +20,7 @@ parameters: - interface: - dhcp_int: - enabled: true -- name: ens3 -+ name: enp1s0 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} -- cgit 1.2.3-korg