patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2018 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, 18 Jul 2017 19:17:24 +0200
  11 Subject: [PATCH] vPDF: Use arm-virtual2 POD config in sample
  12
  13 NOTE: This will be obsoleted when arm-virtual2 vPDF+IDF lands upstream
  14 in Pharos git repo.
  15
  16 Until then, just align the public network configuration used by the
  17 virtual POD with the Enea lab configuration specific to arm-virtual2
  18 (i.e. public network on 10.0.9.0/24).
  19
  20 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  21 ---
  22  mcp/config/labs/local/idf-virtual1.yaml | 22 +++++++++++-----------
  23  1 file changed, 11 insertions(+), 11 deletions(-)
  24
  25 diff --git a/mcp/config/labs/local/idf-virtual1.yaml b/mcp/config/labs/local/idf-virtual1.yaml
  26 index 35dab9b9..5ad45364 100644
  27 --- a/mcp/config/labs/local/idf-virtual1.yaml
  28 +++ b/mcp/config/labs/local/idf-virtual1.yaml
  29 @@ -42,10 +42,10 @@ idf:
  30      public:
  31        interface: 3  # when used, will be fourth vnet interface, untagged
  32        vlan: native
  33 -      network: 10.16.0.0
  34 -      ip-range: 10.16.0.100-10.16.0.254  # Some IPs are in use by lab infra
  35 +      network: 10.0.9.0
  36 +      ip-range: 10.0.9.100-10.0.9.253  # Some IPs are in use by lab infra
  37        mask: 24
  38 -      gateway: 10.16.0.1
  39 +      gateway: 10.0.9.254
  40        dns:
  41          - 8.8.8.8
  42          - 8.8.4.4
  43 @@ -61,16 +61,16 @@ idf:
  44          # Ordered-list, index should be in sync with node index in PDF
  45          - interfaces: &interfaces
  46              # Ordered-list, index should be in sync with interface index in PDF
  47 -            - 'ens3'
  48 -            - 'ens4'
  49 -            - 'ens5'
  50 -            - 'ens6'
  51 +            - 'enp1s0'
  52 +            - 'enp2s0'
  53 +            - 'enp3s0'
  54 +            - 'enp4s0'
  55            busaddr: &busaddr
  56              # Bus-info reported by `ethtool -i ethX`
  57 -            - '0000:00:03.0'
  58 -            - '0000:00:04.0'
  59 -            - '0000:00:05.0'
  60 -            - '0000:00:06.0'
  61 +            - '0000:01:00.0'
  62 +            - '0000:02:00.0'
  63 +            - '0000:03:00.0'
  64 +            - '0000:04:00.0'
  65          - interfaces: *interfaces
  66            busaddr: *busaddr
  67          - interfaces: *interfaces