Merge "[baremetal] Re-assign mgmt network to proxy nodes" into stable/euphrates

[fuel.git] / 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 cfab883..d116c81 100644 (file)
--- a/mcp/patches/0009-seedng-module-Sync-salt-version.patch
+++ b/mcp/patches/0009-seedng-module-Sync-salt-version.patch
@@ -1,3 +1,11 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 Date: Mon, 21 Aug 2017 02:03:01 +0200
 Subject: [PATCH] seedng: module: Sync salt version
@@ -19,7 +27,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']