u/fuel: Bump & rebase for salt ver upstreamopnfv-5.1.RC1opnfv-5.1.0

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

1 files changed, 38 insertions, 36 deletions

diff --git a/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch
index 86a57386..525652db 100644
--- a/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch
+++ b/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch
@@ -15,43 +15,45 @@ salt custom py module seedng.py should use custom repo arg
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/patches/0009-seedng-module-Sync-salt-version.patch | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
+ .../0105-seedng-module-Add-AArch64-repo.patch      | 22 ++++++++++++++++++++++
+ mcp/patches/patches.list                           |  1 +
+ 2 files changed, 23 insertions(+)
+ create mode 100644 mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
 
-diff --git a/mcp/patches/0009-seedng-module-Sync-salt-version.patch b/mcp/patches/0009-seedng-module-Sync-salt-version.patch
-index d116c81..20233a9 100644
---- a/mcp/patches/0009-seedng-module-Sync-salt-version.patch
-+++ b/mcp/patches/0009-seedng-module-Sync-salt-version.patch
-@@ -8,23 +8,29 @@
- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
- From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
- Date: Mon, 21 Aug 2017 02:03:01 +0200
--Subject: [PATCH] seedng: module: Sync salt version
-+Subject: [PATCH] seedng: module: Sync salt version, AArch64 repo
-
- salt custom py module seedng.py should use the same Salt version
- when preinstalling minion for salt-controlled VMs via bootstrap
- script.
-
-+While at it, add AArch64 repo. This used to be a separate patch, but
-+we'll squash it in, so reverse-apply checks still work:
-+- salt custom py module seedng.py should use custom repo arg
-+  "-R linux.enea.com/saltstack" on AArch64 nodes.
+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..d40e63b
+--- /dev/null
++++ b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
+@@ -0,0 +1,22 @@
++From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
++Date: Mon, 21 Aug 2017 02:03:01 +0200
++Subject: [PATCH] seedng: module: Add AArch64 repo
 +
- Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
- ---
-
- diff --git a/_modules/seedng.py b/_modules/seedng.py
- --- a/_modules/seedng.py
- +++ b/_modules/seedng.py
--@@ -256,8 +256,10 @@
-+@@ -256,8 +256,11 @@
-      boot_, tmppath = (prep_bootstrap(mpt)
-               or salt.syspaths.BOOTSTRAP)
-      # Exec the chroot command
--+    arg = 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2]))
++salt custom py module seedng.py should use custom repo arg
++"-R linux.enea.com/saltstack" on AArch64 nodes.
++
++Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
++---
++
++diff --git a/_modules/seedng.py b/_modules/seedng.py
++--- a/_modules/seedng.py
+++++ b/_modules/seedng.py
++@@ -257,6 +257,7 @@
++              or salt.syspaths.BOOTSTRAP)
++     # Exec the chroot command
++-    arg = 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2]))
 ++    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} -c /tmp; fi'.format(os.path.join(tmppath, 'bootstrap-salt.sh'))
- +    cmd += 'else sh {0} -c /tmp {1}; fi'.format(
++     cmd = 'if type salt-minion; then exit 0; '
++     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 7462165..8f3e583 100644
+--- a/mcp/patches/patches.list
++++ b/mcp/patches/patches.list
+@@ -19,3 +19,4 @@
+ /usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
+ /usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
+ /usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
++/usr/share/salt-formulas/env: 0105-seedng-module-Add-AArch64-repo.patch