patches: seedng: Fix arg order for salt-bootstrap 25/40625/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 29 Aug 2017 22:15:22 +0000 (00:15 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 29 Aug 2017 22:16:48 +0000 (00:16 +0200)
JIRA: FUEL-282

Change-Id: I8ba64024c884e2f805d4cda670333ac787fac25c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
mcp/patches/0009-seedng-module-Sync-salt-version.patch

index cfab883..b883147 100644 (file)
@@ -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']