From 5f808291d18c27a2c9bbf6b0b5094af2fa660334 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 11 Mar 2018 18:10:32 +0100 Subject: u/fuel: Bump & rebase for public IP start bump JIRA: ARMBAND-365 Change-Id: I0ca3d397c137d022a68c14435ea1f69064fca359 Signed-off-by: Alexandru Avadanii --- .../0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch | 6 +++--- upstream/fuel | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch b/patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch index 664aef8f..66aff1c0 100644 --- a/patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch +++ b/patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch @@ -23,7 +23,7 @@ Signed-off-by: Alexandru Avadanii 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 f7302494..ab376ab7 100644 +index 35dab9b9..5ad45364 100644 --- a/mcp/config/labs/local/idf-virtual1.yaml +++ b/mcp/config/labs/local/idf-virtual1.yaml @@ -42,10 +42,10 @@ idf: @@ -31,9 +31,9 @@ index f7302494..ab376ab7 100644 interface: 3 # when used, will be fourth vnet interface, untagged vlan: native - network: 10.16.0.0 -- ip-range: 10.16.0.10-10.16.0.254 # Some IPs are in use by lab infra +- 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.10-10.0.9.253 # Some IPs are in use by lab infra ++ 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 diff --git a/upstream/fuel b/upstream/fuel index 9972139f..d6c6e357 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit 9972139f91debfe24c8cb3cfcdfbc595619659e2 +Subproject commit d6c6e357854725975797c3ac0805781220885eed -- cgit 1.2.3-korg