u/fuel: Bump & rebase for vPDF support

Change-Id: Ie0705b598d6fcd37071c05afb90cb2948a88a1f5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
similarity index 100%
rename from patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
rename to patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch

diff --git a/patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch b/patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch
deleted file mode 100644 (file)
index f26994f..0000000
--- a/patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: 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 402af985..2d449c8e 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
-@@ -63,16 +63,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

diff --git a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch
similarity index 99%
rename from patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch
rename to patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 0753ad0..11abe1d 100644 (file)
--- a/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -150,10 +150,10 @@ index 00000000..78eb0bff
 +
 + #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 4d22c617..e6827aa2 100644
+index a17fd694..6dd688ee 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -12,3 +12,5 @@
+@@ -11,3 +11,5 @@
  /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
  /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
  /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch

diff --git a/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch
similarity index 100%
rename from patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch
rename to patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch

diff --git a/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
similarity index 98%
rename from patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
rename to patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
index 1fd80d2..0cfae94 100644 (file)
--- a/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
+++ b/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
@@ -17,7 +17,7 @@ Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
-index 38fe06a8..71bd80de 100644
+index 0189e038..ea758c4b 100644
 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
 @@ -84,7 +84,7 @@ parameters:

diff --git a/upstream/fuel b/upstream/fuel
index 3ed2d8d..d151d43 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit 3ed2d8dab3d75628cd1f7edd47051623c643592c
+Subproject commit d151d4342aa828e0f4c94e7390262080686fcfa3