patches/opnfv-fuel/0002-classes-virtual-AArch64-virtio-NIC-names-sync.patch

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2017 Enea AB and others.
   3 :
   4 : All rights reserved. This program and the accompanying materials
   5 : are made available under the terms of the Apache License, Version 2.0
   6 : which accompanies this distribution, and is available at
   7 : http://www.apache.org/licenses/LICENSE-2.0
   8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   9 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  10 Date: Tue, 25 Jul 2017 02:53:16 +0200
  11 Subject: [PATCH] classes: virtual: AArch64: virtio NIC names sync
  12
  13 grep -e "ens[[:digit:]]" -R . -l | \
  14   xargs sed -i \
  15     -e 's/ens3/enp1s0/g' \
  16     -e 's/ens4/enp2s0/g' \
  17     -e 's/ens5/enp3s0/g' \
  18     -e 's/ens6/enp4s0/g'
  19
  20 Since AArch64 will be using virtio-net-pci NIC model for guests,
  21 predictable interface naming yields a slightly different scheme.
  22
  23 Update all configuration to reflect this.
  24
  25 NOTE: Above configuration is expected with libvirt 3.x, which puts
  26 each NIC on a separate PCIe bus (which also imposes virtio modern
  27 is used).
  28
  29 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  30 ---
  31  .../cluster/virtual-mcp-ocata-common/openstack_compute.yml        | 8 ++++----
  32  .../cluster/virtual-mcp-ocata-common/openstack_control.yml        | 4 ++--
  33  .../cluster/virtual-mcp-ocata-common/openstack_gateway.yml        | 8 ++++----
  34  .../classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml | 2 +-
  35  .../cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml | 2 +-
  36  .../classes/cluster/virtual-mcp-ocata-odl/infra/config.yml        | 2 +-
  37  .../cluster/virtual-mcp-ocata-odl/opendaylight/control.yml        | 2 +-
  38  .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml   | 6 +++---
  39  .../classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml        | 2 +-
  40  9 files changed, 18 insertions(+), 18 deletions(-)
  41
  42 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
  43 index 0cb7ccb..808fbab 100644
  44 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
  45 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
  46 @@ -12,9 +12,9 @@ classes:
  47  - system.ceilometer.client.cinder_volume
  48  parameters:
  49    _param:
  50 -    primary_interface: ens4
  51 -    tenant_interface: ens5
  52 -    external_interface: ens6
  53 +    primary_interface: enp2s0
  54 +    tenant_interface: enp3s0
  55 +    external_interface: enp4s0
  56      interface_mtu: 9000
  57      linux_system_codename: xenial
  58      loopback_device_size: 10
  59 @@ -50,7 +50,7 @@ parameters:
  60        interface:
  61          dhcp_int:
  62            enabled: true
  63 -          name: ens3
  64 +          name: enp1s0
  65            proto: dhcp
  66            type: eth
  67            mtu: ${_param:interface_mtu}
  68 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
  69 index 0927900..69fedb6 100644
  70 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
  71 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
  72 @@ -48,13 +48,13 @@ parameters:
  73            version: latest
  74      network:
  75        interface:
  76 -        ens4:
  77 +        enp2s0:
  78            enabled: true
  79            type: eth
  80            proto: static
  81            address: ${_param:single_address}
  82            netmask: 255.255.255.0
  83 -        ens6:
  84 +        enp4s0:
  85            enabled: true
  86            type: eth
  87            proto: static
  88 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
  89 index 9262590..f5479fc 100644
  90 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
  91 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
  92 @@ -4,9 +4,9 @@ classes:
  93  - system.linux.system.repo.saltstack.xenial
  94  parameters:
  95    _param:
  96 -    primary_interface: ens4
  97 -    tenant_interface: ens5
  98 -    external_interface: ens6
  99 +    primary_interface: enp2s0
 100 +    tenant_interface: enp3s0
 101 +    external_interface: enp4s0
 102      interface_mtu: 9000
 103      linux_system_codename: xenial
 104    neutron:
 105 @@ -19,7 +19,7 @@ parameters:
 106        interface:
 107          dhcp_int:
 108            enabled: true
 109 -          name: ens3
 110 +          name: enp1s0
 111            proto: dhcp
 112            type: eth
 113            mtu: ${_param:interface_mtu}
 114 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
 115 index 63e58a2..2f8e94a 100644
 116 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
 117 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
 118 @@ -27,7 +27,7 @@ parameters:
 119    linux:
 120      network:
 121        interface:
 122 -        ens4:
 123 +        enp2s0:
 124            enabled: true
 125            type: eth
 126            proto: static
 127 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
 128 index 6bc0f51..4dacc73 100644
 129 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
 130 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
 131 @@ -10,7 +10,7 @@ parameters:
 132    linux:
 133      network:
 134        interface:
 135 -        ens4:
 136 +        enp2s0:
 137            enabled: true
 138            type: eth
 139            proto: static
 140 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
 141 index 328d6df..57c6cec 100644
 142 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
 143 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
 144 @@ -27,7 +27,7 @@ parameters:
 145    linux:
 146      network:
 147        interface:
 148 -        ens4:
 149 +        enp2s0:
 150            enabled: true
 151            type: eth
 152            proto: static
 153 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
 154 index 38431a5..066488b 100644
 155 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
 156 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
 157 @@ -10,7 +10,7 @@ parameters:
 158    linux:
 159      network:
 160        interface:
 161 -        ens4:
 162 +        enp2s0:
 163            enabled: true
 164            type: eth
 165            proto: static
 166 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
 167 index 864c71d..aec6cde 100644
 168 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
 169 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
 170 @@ -26,7 +26,7 @@ parameters:
 171    linux:
 172      network:
 173        interface:
 174 -        ens4:
 175 +        enp2s0:
 176            enabled: true
 177            type: eth
 178            proto: static
 179 @@ -51,14 +51,14 @@ parameters:
 180              single_address: 172.16.10.105
 181              tenant_address: 10.1.0.105
 182              external_address: 10.16.0.105
 183 -            dpdk0_name: ens5
 184 +            dpdk0_name: enp3s0
 185              dpdk0_pci: '"0000:00:05.0"'
 186          openstack_compute_node02:
 187            params:
 188              single_address: 172.16.10.106
 189              tenant_address: 10.1.0.106
 190              external_address: 10.16.0.106
 191 -            dpdk0_name: ens5
 192 +            dpdk0_name: enp3s0
 193              dpdk0_pci: '"0000:00:05.0"'
 194          openstack_gateway_node01:
 195            params:
 196 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
 197 index 97730b1..8cb0992 100644
 198 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
 199 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
 200 @@ -26,7 +26,7 @@ parameters:
 201    linux:
 202      network:
 203        interface:
 204 -        ens4:
 205 +        enp2s0:
 206            enabled: true
 207            type: eth
 208            proto: static