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 | 20 ++++++++++----------
  23  1 file changed, 10 insertions(+), 10 deletions(-)
  24
  25 diff --git a/mcp/config/labs/local/idf-virtual1.yaml b/mcp/config/labs/local/idf-virtual1.yaml
  26 index 2142baf..415f63c 100644
  27 --- a/mcp/config/labs/local/idf-virtual1.yaml
  28 +++ b/mcp/config/labs/local/idf-virtual1.yaml
  29 @@ -41,9 +41,9 @@ idf:
  30      public:
  31        interface: 3  # when used, will be fourth vnet interface, untagged
  32        vlan: native
  33 -      network: 10.16.0.0
  34 +      network: 10.0.9.0
  35        mask: 24
  36 -      gateway: 10.16.0.1
  37 +      gateway: 10.0.9.254
  38        dns:
  39          - 8.8.8.8
  40          - 8.8.4.4
  41 @@ -59,16 +59,16 @@ idf:
  42          # Ordered-list, index should be in sync with node index in PDF
  43          - interfaces: &interfaces
  44              # Ordered-list, index should be in sync with interface index in PDF
  45 -            - 'ens3'
  46 -            - 'ens4'
  47 -            - 'ens5'
  48 -            - 'ens6'
  49 +            - 'enp1s0'
  50 +            - 'enp2s0'
  51 +            - 'enp3s0'
  52 +            - 'enp4s0'
  53            busaddr: &busaddr
  54              # Bus-info reported by `ethtool -i ethX`
  55 -            - '0000:00:03.0'
  56 -            - '0000:00:04.0'
  57 -            - '0000:00:05.0'
  58 -            - '0000:00:06.0'
  59 +            - '0000:01:00.0'
  60 +            - '0000:02:00.0'
  61 +            - '0000:03:00.0'
  62 +            - '0000:04:00.0'
  63          - interfaces: *interfaces
  64            busaddr: *busaddr
  65          - interfaces: *interfaces