diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-29 03:29:25 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-29 03:30:00 +0200 |
| commit | 0c9006bff2baf01c9e9d1f39f28782b82f1a2f1b (patch) | |
| tree | 720ffa2f574c91f86f2ed324dcd34e6bfd42e3b1 | |
| parent | c994e65fa0fac7bf2c5bb199763990623d528286 (diff) | |
p/fuel: Fix seedng salt-bootstrap arg order
Change-Id: Iaa7c14a73a7e3d01d8bffb939c755f582d565b26
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rw-r--r-- | patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch | 7 |
1 files changed, 4 insertions, 3 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 918a4d86..a5819fa1 100644 --- a/patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch +++ b/patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch @@ -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) |