u/fuel: Bump for jump bridge configuration rework 87/44287/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 4 Oct 2017 22:57:45 +0000 (00:57 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 4 Oct 2017 22:59:19 +0000 (00:59 +0200)
Change-Id: I23100e3fd9854cd1ffd52961a0260d3c23875dd1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch
upstream/fuel

index f6a0355..67e7a95 100644 (file)
@@ -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:
index c876fbd..e038840 100644 (file)
@@ -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() {
index a05f8d2..f69a28e 160000 (submodule)
@@ -1 +1 @@
-Subproject commit a05f8d2682f2449d7d10e52038c56a0af6357def
+Subproject commit f69a28ea02cc6a53d3b3d289576b17fbb31a67cc