aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-04 23:56:50 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-04 23:57:20 +0100
commitdaf95f3b779db56222be35e04610bac83a53575a (patch)
treeffada998c580cb49825647fe3c377dea47a931da
parent8670d1557a20d9aab1cdaeacf820f275689d34c9 (diff)
u/fuel: Bump & rebase for nbd module build
Change-Id: Iff82769f7f5e867baa54c0ceece765be207df17f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch2
m---------upstream/fuel0
2 files changed, 1 insertions, 1 deletions
diff --git a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
index 724cafc..dac4ff3 100644
--- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
+++ b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
@@ -75,7 +75,7 @@ index 284f1bc..533500d 100644
/usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
+/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
-index 7a37fe7..3de9d49 100644
+index 04ffdb4..9cad061 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
@@ -39,6 +39,42 @@ parameters:
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 6e0e518d43cecfb8f981dbd51326d8eae103720
+Subproject 84f58189f269be6633e0c8897d5624d3dfaaa65