summaryrefslogtreecommitdiffstats
path: root/mcp/patches
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-30 00:15:22 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-30 00:16:48 +0200
commitd8c77e4e5453a27a66387d7deb23dba06d1e3ae7 (patch)
tree15bba43e62373cb311a808cdb0fba8b4faa3cef7 /mcp/patches
parentfbc1062a9d0b5c364e52a89eb736a998193f32e8 (diff)
patches: seedng: Fix arg order for salt-bootstrap
JIRA: FUEL-282 Change-Id: I8ba64024c884e2f805d4cda670333ac787fac25c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches')
-rw-r--r--mcp/patches/0009-seedng-module-Sync-salt-version.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/patches/0009-seedng-module-Sync-salt-version.patch b/mcp/patches/0009-seedng-module-Sync-salt-version.patch
index cfab88304..b88314774 100644
--- a/mcp/patches/0009-seedng-module-Sync-salt-version.patch
+++ b/mcp/patches/0009-seedng-module-Sync-salt-version.patch
@@ -19,7 +19,7 @@ diff --git a/_modules/seedng.py b/_modules/seedng.py
+ 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} {1} -c /tmp; fi'.format(
++ cmd += 'else sh {0} -c /tmp {1}; fi'.format(
+ os.path.join(tmppath, 'bootstrap-salt.sh'), arg)
return not __salt__['cmd.run_chroot'](mpt, cmd, python_shell=True)['retcode']