aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch
blob: c3ffa52a4b801dfad608ce6bdd0ee2e6a41ed19a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
: Copyright (c) 2018 Enea AB and others.
:
: All rights reserved. This program and the accompanying materials
: are made available under the terms of the Apache License, Version 2.0
: which accompanies this distribution, and is available at
: http://www.apache.org/licenses/LICENSE-2.0
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 18 Jul 2017 19:17:24 +0200
Subject: [PATCH] vPDF: Use arm-virtual2 POD config in sample

NOTE: This will be obsoleted when arm-virtual2 vPDF+IDF lands upstream
in Pharos git repo.

Until then, just align the public network configuration used by the
virtual POD with the Enea lab configuration specific to arm-virtual2
(i.e. public network on 10.0.9.0/24).

Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 mcp/config/labs/local/idf-virtual1.yaml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/mcp/config/labs/local/idf-virtual1.yaml b/mcp/config/labs/local/idf-virtual1.yaml
index 79a5fa04..8a5fbb91 100644
--- a/mcp/config/labs/local/idf-virtual1.yaml
+++ b/mcp/config/labs/local/idf-virtual1.yaml
@@ -42,10 +42,10 @@ idf:
     public:
       interface: 3  # when used, will be fourth vnet interface, untagged
       vlan: native
-      network: 10.16.0.0
-      ip-range: 10.16.0.100-10.16.0.254  # Some IPs are in use by lab infra
+      network: 10.0.9.0
+      ip-range: 10.0.9.100-10.0.9.253  # Some IPs are in use by lab infra
       mask: 24
-      gateway: 10.16.0.1
+      gateway: 10.0.9.254
       dns:
         - 8.8.8.8
         - 8.8.4.4
@@ -61,16 +61,16 @@ idf:
         # Ordered-list, index should be in sync with node index in PDF
         - interfaces: &interfaces
             # Ordered-list, index should be in sync with interface index in PDF
-            - 'ens3'
-            - 'ens4'
-            - 'ens5'
-            - 'ens6'
+            - 'enp1s0'
+            - 'enp2s0'
+            - 'enp3s0'
+            - 'enp4s0'
           busaddr: &busaddr
             # Bus-info reported by `ethtool -i ethX`
-            - '0000:00:03.0'
-            - '0000:00:04.0'
-            - '0000:00:05.0'
-            - '0000:00:06.0'
+            - '0000:01:00.0'
+            - '0000:02:00.0'
+            - '0000:03:00.0'
+            - '0000:04:00.0'
         - interfaces: *interfaces
           busaddr: *busaddr
         - interfaces: *interfaces