From d8c77e4e5453a27a66387d7deb23dba06d1e3ae7 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 30 Aug 2017 00:15:22 +0200 Subject: patches: seedng: Fix arg order for salt-bootstrap JIRA: FUEL-282 Change-Id: I8ba64024c884e2f805d4cda670333ac787fac25c Signed-off-by: Alexandru Avadanii --- mcp/patches/0009-seedng-module-Sync-salt-version.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mcp/patches/0009-seedng-module-Sync-salt-version.patch') 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'] -- cgit 1.2.3-korg