valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,882 Commits 24 Branches 182 Tags 341 MiB
ea2017672d
Commit Graph

38882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
ea2017672d Merge pull request #23311 from cellscape/fix-salt-cloud-lxc-init 
Fix new container initialization in LXC runner
 2015-05-04 03:55:29 -06:00
cellscape
76fbb34e7d Fix new container initialization in LXC runner 
When creating new LXC container with help of salt-cloud lxc.init crashes
with similar message:

[INFO    ] Creating container(s) '['test-host']' on host 'lxc-host'
[ERROR   ] Failed to create VM test-host. Configuration value 'test-host' needs to be set
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/cloud/__init__.py", line 1193, in create
    output = self.clouds[func](vm_)
  File "/usr/lib/python2.7/dist-packages/salt/cloud/clouds/lxc.py", line 424, in create
    cret = _runner().cmd('lxc.cloud_init', [vm_['name']], kwarg=kwarg)
  File "/usr/lib/python2.7/dist-packages/salt/runner.py", line 123, in cmd
    return self.functions[fun](*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/runners/lxc.py", line 355, in cloud_init
    saltcloud_mode=True, quiet=quiet, **kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/runners/lxc.py", line 257, in init
    kw['seed'] = seeds[name]
KeyError: 'test-host'

The reason is that salt-cloud always passes generated keys to lxc.init,
it skips seeds dictionary population and errors out trying to lookup
non-existent key.

Fix this by using fallback value of True because we always want to seed
minion in such case.
 2015-05-04 10:50:42 +06:00
Nicole Thomas
c399b8f568 Merge pull request #23298 from chris-prince/2014.7 
Fixed issue #18880 in 2014.7 branch
 2015-05-03 09:49:41 -06:00
chris-prince
0fa25dbb58 Fixed issue #18880 in 2014.7 branch 2015-05-02 11:24:06 -07:00
Justin Findlay
16ecefd466 Merge pull request #23292 from rallytime/merge-23151 
Merge #23151 with pylint fixes
 2015-05-01 21:54:12 -06:00
rallytime
8ff852a23a Merge #23151 with pylint fixes 2015-05-01 19:38:11 -07:00
Colton Myers
ce24315a4b Merge pull request #23274 from basepi/salt-ssh.debug.verbosity 
[2014.7] Reduce salt-ssh debug log verbosity
 2015-05-01 14:19:23 -06:00
Colton Myers
ecee6c68f4 Log stdout and stderr to trace 2015-05-01 13:22:58 -06:00
Colton Myers
08f54d79c6 Log stdout and stderr to trace as well 2015-05-01 13:18:41 -06:00
Colton Myers
9b9c30f5ad Reduce salt-ssh debug log verbosity 
Anything that involves the SHIM should be logged to TRACE
 2015-05-01 13:08:49 -06:00
Justin Findlay
7b55e4310f Merge pull request #23261 from rallytime/fix-22605 
Fix tornado websocket event handler registration
 2015-05-01 12:20:31 -06:00
rallytime
4950fbf2b3 Fix tornado websocket event handler registration 
Fixes #22605
 2015-05-01 09:37:41 -07:00
Mike Place
83ef7cb114 Merge pull request #23258 from teizz/ret_keepalive_2014_7_5 
TCP keepalives on the ret side, Revisited.
 2015-05-01 10:13:49 -06:00
Teizz
0b9fb6f9be The fixes by cachedout which were backported into 2015_2 were missing a single parameter thus not setting up the TCP keepalive for the ZeroMQ Channel by default. 2015-05-01 17:46:47 +02:00
Justin Findlay
8de3c83956 Merge pull request #23241 from techhat/issue23224 
Move iptables log options after the jump
 2015-04-30 19:31:59 -06:00
Justin Findlay
f20210e499 Merge pull request #23228 from rallytime/bp-23171 
Backport #23171 to 2014.7
 2015-04-30 15:09:45 -06:00
Justin Findlay
721cc285ee Merge pull request #23227 from rallytime/bp-22808 
Backport #22808 to 2014.7
 2015-04-30 15:09:14 -06:00
Joseph Hall
87f7948c99 Move iptables log options after the jump 2015-04-30 14:45:35 -06:00
Sergey Kizunov
e670e99506 Bugfix: 'clean_proc_dir' is broken 
Upon testing (in my Windows environment), I noticed that in
clean_proc_dir():
    job = salt.payload.Serial(opts).load(fp_)

The result would always be that 'job' is None. Upon further
investigation, this seems to be the case because of this line above:
    job_data = fp_.read()

If I remove that line, things work as expected. So it seems like the
'fp_.read()' will move the current file position of 'fp_' to the end,
and so 'salt.payload.Serial(opts).load(fp_)' would end up reading what
it thinks is an empty file.

Looking at the logic, it seems like 'job_data = fp_.read()' is an
unnecessary step in any case, so it has been removed.

I have noticed that this same incorrect logic also exists in the 2015.2
and 2014.7 branches.

Also, added a fix for deleting files on Windows which was already in
another part of the same function.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-04-30 09:49:59 -07:00
Colton Myers
d208a00b2a Dict, not list 2015-04-30 09:48:25 -07:00
Colton Myers
a3f529e003 It's already been converted to a list 2015-04-30 09:48:25 -07:00
Colton Myers
dd57f2d1c1 Add list targeting to salt-ssh flat roster 
Fixes #22703
 2015-04-30 09:48:25 -07:00
Thomas S Hatch
82c22afacc Merge pull request #22823 from hvnsweeting/22822-file-directory-clean 
22822 file directory clean
 2015-04-30 08:25:51 -07:00
Thomas S Hatch
f6c0728bfb Merge pull request #22977 from bersace/fix-fileserver-backends-pillar-side-effect 
Fix fileserver backends __opts__ overwritten by _pillar
 2015-04-30 08:24:56 -07:00
Thomas S Hatch
34206f7ae3 Merge pull request #23180 from jfindlay/remote_event 
fix typos from 36841bdd in masterapi.py
 2015-04-30 08:22:41 -07:00
Thomas S Hatch
b6b82165c8 Merge pull request #23176 from jfindlay/run_chroot 
copy standard cmd.run* kwargs into cmd.run_chroot
 2015-04-30 08:22:12 -07:00
Justin Findlay
effacbe294 Merge pull request #23193 from joejulian/2014.7_supervisord_accept_sfun 
supervisord.mod_watch should accept sfun
 2015-04-29 22:34:21 -06:00
Justin Findlay
72fe88e5c6 Merge pull request #23188 from basepi/salt-ssh.function.wrapper.gpg.19114 
[2014.7] Work around bug in salt-ssh in config.get for gpg renderer
 2015-04-29 22:34:10 -06:00
Joe Julian
efb59f9d9d supervisord.mod_watch should accept sfun 
Fixes #23192
 2015-04-29 16:03:41 -07:00
Colton Myers
d73979ee12 Work around bug in salt-ssh in config.get for gpg renderer 2015-04-29 16:17:35 -06:00
Justin Findlay
72066e1073 fix typos from 36841bdd in masterapi.py 
Fixes #23166.
 2015-04-29 13:19:39 -06:00
Justin Findlay
7dc3417b44 copy standard cmd.run* kwargs into cmd.run_chroot 
Fixes #23153.
 2015-04-29 12:24:52 -06:00
Justin Findlay
168508ec2a Merge pull request #23154 from cachedout/refresh_channel 
Re-establish channel on interruption in fileclient
 2015-04-29 10:18:59 -06:00
Viet Hung Nguyen
c749c276b4 fix lint - remove unnecessary parenthesis 2015-04-29 09:56:06 +07:00
Mike Place
9f8dd80c38 Re-establish channel on interruption in fileclient 
Refs #21480
 2015-04-28 16:03:15 -06:00
Cristi P
8ffa12e82d Fixes #23148 2015-04-29 00:29:36 +03:00
Justin Findlay
3b53e04534 Merge pull request #23146 from rallytime/bp-20779 
Backport #20779 to 2014.7
 2015-04-28 14:45:06 -06:00
Justin Findlay
8bb4664bf9 Merge pull request #23145 from rallytime/bp-23089 
Backport #23089 to 2014.7
 2015-04-28 14:44:56 -06:00
Justin Findlay
c85d36fd29 Merge pull request #23144 from rallytime/bp-23124-2014-7 
Backport #23124 to 2014.7
 2015-04-28 14:44:46 -06:00
Justin Findlay
ffd18493e8 compare OrderedDicts in serializer unit test 2015-04-28 13:30:16 -06:00
Mike Place
a22170627c Just change serialize 2015-04-28 13:30:16 -06:00
Mike Place
a111798e8e Use declared yaml options 
Fixes #20647
 2015-04-28 13:30:15 -06:00
Mike Place
93c41afd23 Stringify version number before lstrip 2015-04-28 13:27:54 -06:00
Kevin Boulain
6b64da706c fix parsing the output of parted 2015-04-28 13:23:42 -06:00
Colton Myers
a27b158153 Merge pull request #23120 from terminalmage/fix-gitfs-relpath 
Don't run os.path.relpath() if repo doesn't have a "root" param set
 2015-04-28 09:46:54 -06:00
Justin Findlay
fcba607978 Merge pull request #23132 from clinta/patch-2 
Backport b27c176
 2015-04-28 09:00:30 -06:00
Clint Armstrong
a824d727d1 Backport b27c176 
Backport the [b27c176](b27c176f1c) to 2014.07.

check_cmd does not work without it.
 2015-04-28 09:46:02 -04:00
Justin Findlay
b0f4b28487 Merge pull request #23114 from rallytime/remove_ubuntu_zmq4_docs 
Adjust ZeroMQ 4 docs to reflect changes to Ubuntu 12 packages
 2015-04-27 21:59:24 -06:00
Justin Findlay
399857f20b Merge pull request #23108 from rallytime/bp-23097 
Backport #23097 to 2014.7
 2015-04-27 21:58:05 -06:00
Justin Findlay
5541537c32 Merge pull request #23112 from basepi/mysql_returner_save_load 
[2014.7] Backport #22199 to fix mysql returner save_load errors
 2015-04-27 21:55:44 -06:00