p/fuel: Fix seedng salt-bootstrap arg order 43/40543/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 29 Aug 2017 01:29:25 +0000 (03:29 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 29 Aug 2017 01:30:00 +0000 (03:30 +0200)
Change-Id: Iaa7c14a73a7e3d01d8bffb939c755f582d565b26
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch

index 918a4d8..a5819fa 100644 (file)
@@ -17,7 +17,7 @@ new file mode 100644
 index 0000000..1cb80bc
 --- /dev/null
 +++ b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
-@@ -0,0 +1,21 @@
+@@ -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
@@ -34,8 +34,9 @@ index 0000000..1cb80bc
 +@@ -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]))
+++    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(
 +         os.path.join(tmppath, 'bootstrap-salt.sh'), arg)