summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-30 01:31:31 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-30 01:33:43 +0200
commitad5e266b0e10252c3f7ba08dd81b79a322d2d1a6 (patch)
tree9a5603efe0ac7db71980cdf1f6ef85d2e3d0b8c8
parent55038ceb2a740c1341a31873c391bb2dda6d6cfb (diff)
u/fuel: Bump & rebase for seedng arg order fix
JIRA: FUEL-282 Change-Id: Ica3133c967c906b3c2ab3a8e0ecc49aff11cdb10 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch4
m---------upstream/fuel0
2 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch
index 6b3aed08..24789a07 100644
--- a/patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch
+++ b/patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch
@@ -22,7 +22,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
diff --git a/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
new file mode 100644
-index 0000000..67c1ea1
+index 0000000..d40e63b
--- /dev/null
+++ b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
@@ -0,0 +1,22 @@
@@ -46,7 +46,7 @@ index 0000000..67c1ea1
++ arg = '-R linux.enea.com/saltstack ' if os.uname()[-1] == 'aarch64' else ''
++ arg += 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2]))
+ cmd = 'if type salt-minion; then exit 0; '
-+ cmd += 'else sh {0} {1} -c /tmp; fi'.format(
++ cmd += 'else sh {0} -c /tmp {1}; fi'.format(
+ os.path.join(tmppath, 'bootstrap-salt.sh'), arg)
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index f6504ab..1faa164 100644
diff --git a/upstream/fuel b/upstream/fuel
-Subproject fbc1062a9d0b5c364e52a89eb736a998193f32e
+Subproject d8c77e4e5453a27a66387d7deb23dba06d1e3ae