aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-05 00:57:45 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-04 22:59:44 +0000
commit33f1ab7edc6ea39ec661ce74c3e642561d00a782 (patch)
tree1a4a55c8482407cb4d0f789739eb37a8cb568536
parentc5c9e23e0df08e46862b4c2a8deff825b76a9f13 (diff)
u/fuel: Bump for jump bridge configuration rework
Change-Id: I23100e3fd9854cd1ffd52961a0260d3c23875dd1 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 08392c03d6bb184bc61dea46eec33d20f2b9c1d9)
-rw-r--r--patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch4
-rw-r--r--patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch2
m---------upstream/fuel0
3 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
index f6a0355b..67e7a951 100644
--- a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
+++ b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
@@ -120,7 +120,7 @@ index 67a2c4d..331a262 100644
- - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
+ - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
-index 737d6cb..074cadc 100644
+index 2e39588..e5c6573 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
@@ -5,9 +5,9 @@ classes:
@@ -403,7 +403,7 @@ index aa3cb4f..163cf5f 100644
- - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
+ - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
-index cebc779..b2da07e 100644
+index c0a4874..dffcad6 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
@@ -5,9 +5,9 @@ classes:
diff --git a/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
index c876fbd6..e0388403 100644
--- a/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
+++ b/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
@@ -31,7 +31,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
1 file changed, 10 insertions(+)
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
-index dc4d9dc..04ce005 100644
+index fcc5d76..c0eb330 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -28,6 +28,15 @@ get_base_image() {
diff --git a/upstream/fuel b/upstream/fuel
-Subproject a05f8d2682f2449d7d10e52038c56a0af6357de
+Subproject f69a28ea02cc6a53d3b3d289576b17fbb31a67c