valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
47,637 Commits 24 Branches 182 Tags 341 MiB
9bc1519ee7
Commit Graph

47637 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
23b0291f96 Merge pull request #23304 from s0undt3ch/2015.2 
Py3 compatible function globals attribute
 2015-05-03 10:06:27 -06:00
Nicole Thomas
5f40a15014 Merge pull request #23297 from chris-prince/2015.2 
Fixed issue #18880 in 2015.2 branch
 2015-05-03 09:50:04 -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
Nicole Thomas
587c63733f Merge pull request #23254 from cro/mac_sys_prof 
Module to support Mac OS X's system_profiler.
 2015-05-03 09:39:50 -06:00
Pedro Algarvio
5d6d36e641 Py3 compatible function globals attribute 2015-05-03 16:18:52 +01:00
Thomas S Hatch
49d3835817 Merge pull request #23279 from sambev/issue/#23278 
Iterate over a copy of schedule[job] since we are mutating it.
 2015-05-02 18:42:01 -06:00
C. R. Oldham
c6d2f6bb0d Typo. 2015-05-02 16:11:15 -06:00
C. R. Oldham
f9b1d0a3ff Spelling error. 2015-05-02 16:04:19 -06:00
C. R. Oldham
5d6d32b766 Rename module per @rallytime's suggestion, fix non-Python 2.6 code 2015-05-02 15:58:46 -06:00
chris-prince
7c5a0e32d9 Fixed issue #18880 in 2015.2 branch 2015-05-02 11:25:43 -07: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
Justin Findlay
67937c3b70 Merge pull request #23284 from jfindlay/http_lint 
merge #23280
 2015-05-01 16:02:06 -06:00
Justin Findlay
3945d980d9 remove old import 2015-05-01 15:36:59 -06:00
Pedro Algarvio
b9df077936 Use the right moved reference from six 2015-05-01 21:59:49 +01:00
Sam Beveridge
321eaab2a8 Iterate over a copy of schedule[job] since we are mutating it. 2015-05-01 14:32:14 -06: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
Nicole Thomas
da0bc489ba Merge pull request #23259 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-05-01 11:12:11 -07:00
rallytime
4950fbf2b3 Fix tornado websocket event handler registration 
Fixes #22605
 2015-05-01 09:37:41 -07:00
Colton Myers
4ae1fb91c7 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    salt/modules/iptables.py
    salt/transport/__init__.py
 2015-05-01 10:24:34 -06: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
C. R. Oldham
fccbc71622 Add module to support Mac OSX's System Profiler utility. 2015-05-01 07:35:04 -06: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
f591a717d9 Merge pull request #23237 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-04-30 19:31:10 -06:00
Colton Myers
1973feb18f Fix lint 2015-04-30 15:40:45 -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
Colton Myers
442f50d074 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    salt/modules/cmdmod.py
    salt/states/file.py
 2015-04-30 14:21:52 -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
6e18810745 Merge pull request #23209 from jayeshka/disk-states-unit-test 
adding states/disk unit test case
 2015-04-30 08:30:43 -07:00
Thomas S Hatch
6a1e86efce Merge pull request #23208 from jayeshka/eselect-states-unit-test 
adding states/eselect unit test case
 2015-04-30 08:30:33 -07:00
Thomas S Hatch
6016e00eaf Merge pull request #23207 from jayeshka/drac-states-unit-test 
adding states/drac unit test case
 2015-04-30 08:30:18 -07:00
Thomas S Hatch
365c16b901 Merge pull request #23206 from jayeshka/composer-states-unit-test 
adding states/composer unit test case
 2015-04-30 08:30:02 -07:00
Thomas S Hatch
9360af2afc Merge pull request #23205 from jayeshka/debconfmod-states-unit-test 
adding states/debconfmod unit test case
 2015-04-30 08:29:46 -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
e608c56796 Merge pull request #23204 from jayeshka/ddns-states-unit-test 
adding states/ddns unit test case
 2015-04-30 08:23:43 -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