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

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Tue, 25 Jul 2017 02:53:16 +0200
   3 Subject: [PATCH] classes: virtual: AArch64: virtio NIC names sync
   4
   5 grep -e "ens[[:digit:]]" -R . -l | \
   6   xargs sed -i \
   7     -e 's/ens3/enp1s0/g' \
   8     -e 's/ens4/enp2s2/g' \
   9     -e 's/ens5/enp3s0/g' \
  10     -e 's/ens6/enp4s0/g'
  11
  12 Since AArch64 will be using virtio-net-pci NIC model for guests,
  13 predictable interface naming yields a slightly different scheme.
  14
  15 Update all configuration to reflect this.
  16
  17 NOTE: Above configuration is expected with libvirt 3.x, which puts
  18 each NIC on a separate PCIe bus (which also imposes virtio modern
  19 is used).
  20
  21 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  22 ---
  23  .../classes/cluster/virtual-mcp-ocata-odl/infra/config.yml        | 2 +-
  24  .../cluster/virtual-mcp-ocata-odl/opendaylight/control.yml        | 2 +-
  25  .../classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml   | 8 ++++----
  26  .../classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml   | 4 ++--
  27  .../classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml   | 8 ++++----
  28  .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml   | 6 +++---
  29  .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml      | 8 ++++----
  30  .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml      | 4 ++--
  31  .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml      | 8 ++++----
  32  .../classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml        | 2 +-
  33  .../classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml   | 8 ++++----
  34  .../classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml   | 4 ++--
  35  .../classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml   | 8 ++++----
  36  13 files changed, 36 insertions(+), 36 deletions(-)
  37
  38 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
  39 index 328d6df..57c6cec 100644
  40 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
  41 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml
  42 @@ -27,7 +27,7 @@ parameters:
  43    linux:
  44      network:
  45        interface:
  46 -        ens4:
  47 +        enp2s0:
  48            enabled: true
  49            type: eth
  50            proto: static
  51 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
  52 index 6c6640a..ec02e94 100644
  53 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
  54 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml
  55 @@ -11,7 +11,7 @@ parameters:
  56    linux:
  57      network:
  58        interface:
  59 -        ens4:
  60 +        enp2s0:
  61            enabled: true
  62            type: eth
  63            proto: static
  64 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
  65 index 97eda6c..3f18ccd 100644
  66 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
  67 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
  68 @@ -10,9 +10,9 @@ classes:
  69  - cluster.virtual-mcp-ocata-odl
  70  parameters:
  71    _param:
  72 -    primary_interface: ens4
  73 -    tenant_interface: ens5
  74 -    external_interface: ens6
  75 +    primary_interface: enp2s0
  76 +    tenant_interface: enp3s0
  77 +    external_interface: enp4s0
  78      interface_mtu: 9000
  79      linux_system_codename: xenial
  80      loopback_device_size: 10
  81 @@ -52,7 +52,7 @@ parameters:
  82        interface:
  83          dhcp_int:
  84            enabled: true
  85 -          name: ens3
  86 +          name: enp1s0
  87            proto: dhcp
  88            type: eth
  89            mtu: ${_param:interface_mtu}
  90 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
  91 index 17c22c5..ca3a812 100644
  92 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
  93 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
  94 @@ -40,13 +40,13 @@ parameters:
  95            version: latest
  96      network:
  97        interface:
  98 -        ens4:
  99 +        enp2s0:
 100            enabled: true
 101            type: eth
 102            proto: static
 103            address: ${_param:single_address}
 104            netmask: 255.255.255.0
 105 -        ens6:
 106 +        enp4s0:
 107            enabled: true
 108            type: eth
 109            proto: static
 110 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
 111 index e8421ca..657ddd3 100644
 112 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
 113 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml
 114 @@ -6,9 +6,9 @@ classes:
 115  - cluster.virtual-mcp-ocata-odl
 116  parameters:
 117    _param:
 118 -    primary_interface: ens4
 119 -    tenant_interface: ens5
 120 -    external_interface: ens6
 121 +    primary_interface: enp2s0
 122 +    tenant_interface: enp3s0
 123 +    external_interface: enp4s0
 124      interface_mtu: 9000
 125      linux_system_codename: xenial
 126      neutron_agents:
 127 @@ -32,7 +32,7 @@ parameters:
 128        interface:
 129          dhcp_int:
 130            enabled: true
 131 -          name: ens3
 132 +          name: enp1s0
 133            proto: dhcp
 134            type: eth
 135            mtu: ${_param:interface_mtu}
 136 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
 137 index 864c71d..aec6cde 100644
 138 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
 139 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
 140 @@ -26,7 +26,7 @@ parameters:
 141    linux:
 142      network:
 143        interface:
 144 -        ens4:
 145 +        enp2s0:
 146            enabled: true
 147            type: eth
 148            proto: static
 149 @@ -51,14 +51,14 @@ parameters:
 150              single_address: 172.16.10.105
 151              tenant_address: 10.1.0.105
 152              external_address: 10.16.0.105
 153 -            dpdk0_name: ens5
 154 +            dpdk0_name: enp3s0
 155              dpdk0_pci: '"0000:00:05.0"'
 156          openstack_compute_node02:
 157            params:
 158              single_address: 172.16.10.106
 159              tenant_address: 10.1.0.106
 160              external_address: 10.16.0.106
 161 -            dpdk0_name: ens5
 162 +            dpdk0_name: enp3s0
 163              dpdk0_pci: '"0000:00:05.0"'
 164          openstack_gateway_node01:
 165            params:
 166 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
 167 index c23ca7f..6d2f724 100644
 168 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
 169 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
 170 @@ -12,9 +12,9 @@ classes:
 171  - cluster.virtual-mcp-ocata-ovs-dpdk
 172  parameters:
 173    _param:
 174 -    primary_interface: ens4
 175 -    tenant_interface: ens5
 176 -    external_interface: ens6
 177 +    primary_interface: enp2s0
 178 +    tenant_interface: enp3s0
 179 +    external_interface: enp4s0
 180      interface_mtu: 9000
 181      linux_system_codename: xenial
 182      loopback_device_size: 10
 183 @@ -51,7 +51,7 @@ parameters:
 184        interface:
 185          dhcp_int:
 186            enabled: true
 187 -          name: ens3
 188 +          name: enp1s0
 189            proto: dhcp
 190            type: eth
 191            mtu: ${_param:interface_mtu}
 192 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
 193 index b85f085..20eb8f5 100644
 194 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
 195 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
 196 @@ -40,13 +40,13 @@ parameters:
 197            version: latest
 198      network:
 199        interface:
 200 -        ens4:
 201 +        enp2s0:
 202            enabled: true
 203            type: eth
 204            proto: static
 205            address: ${_param:single_address}
 206            netmask: 255.255.255.0
 207 -        ens6:
 208 +        enp4s0:
 209            enabled: true
 210            type: eth
 211            proto: static
 212 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
 213 index e102c10..f153a19 100644
 214 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
 215 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
 216 @@ -6,9 +6,9 @@ classes:
 217  - cluster.virtual-mcp-ocata-ovs-dpdk
 218  parameters:
 219    _param:
 220 -    primary_interface: ens4
 221 -    tenant_interface: ens5
 222 -    external_interface: ens6
 223 +    primary_interface: enp2s0
 224 +    tenant_interface: enp3s0
 225 +    external_interface: enp4s0
 226      interface_mtu: 9000
 227      linux_system_codename: xenial
 228    neutron:
 229 @@ -22,7 +22,7 @@ parameters:
 230        interface:
 231          dhcp_int:
 232            enabled: true
 233 -          name: ens3
 234 +          name: enp1s0
 235            proto: dhcp
 236            type: eth
 237            mtu: ${_param:interface_mtu}
 238 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
 239 index 97730b1..8cb0992 100644
 240 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
 241 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
 242 @@ -26,7 +26,7 @@ parameters:
 243    linux:
 244      network:
 245        interface:
 246 -        ens4:
 247 +        enp2s0:
 248            enabled: true
 249            type: eth
 250            proto: static
 251 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
 252 index a86a7c6..0469fa0 100644
 253 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
 254 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
 255 @@ -10,9 +10,9 @@ classes:
 256  - cluster.virtual-mcp-ocata-ovs
 257  parameters:
 258    _param:
 259 -    primary_interface: ens4
 260 -    tenant_interface: ens5
 261 -    external_interface: ens6
 262 +    primary_interface: enp2s0
 263 +    tenant_interface: enp3s0
 264 +    external_interface: enp4s0
 265      interface_mtu: 9000
 266      linux_system_codename: xenial
 267      loopback_device_size: 10
 268 @@ -47,7 +47,7 @@ parameters:
 269        interface:
 270          dhcp_int:
 271            enabled: true
 272 -          name: ens3
 273 +          name: enp1s0
 274            proto: dhcp
 275            type: eth
 276            mtu: ${_param:interface_mtu}
 277 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
 278 index ae103cd..350b618 100644
 279 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
 280 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
 281 @@ -40,13 +40,13 @@ parameters:
 282            version: latest
 283      network:
 284        interface:
 285 -        ens4:
 286 +        enp2s0:
 287            enabled: true
 288            type: eth
 289            proto: static
 290            address: ${_param:single_address}
 291            netmask: 255.255.255.0
 292 -        ens6:
 293 +        enp4s0:
 294            enabled: true
 295            type: eth
 296            proto: static
 297 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
 298 index 9257d86..26b0e4c 100644
 299 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
 300 +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
 301 @@ -6,9 +6,9 @@ classes:
 302  - cluster.virtual-mcp-ocata-ovs
 303  parameters:
 304    _param:
 305 -    primary_interface: ens4
 306 -    tenant_interface: ens5
 307 -    external_interface: ens6
 308 +    primary_interface: enp2s0
 309 +    tenant_interface: enp3s0
 310 +    external_interface: enp4s0
 311      interface_mtu: 9000
 312      linux_system_codename: xenial
 313    neutron:
 314 @@ -20,7 +20,7 @@ parameters:
 315        interface:
 316          dhcp_int:
 317            enabled: true
 318 -          name: ens3
 319 +          name: enp1s0
 320            proto: dhcp
 321            type: eth
 322            mtu: ${_param:interface_mtu}