Commit Graph

38910 Commits

Author SHA1 Message Date
Thomas S Hatch
ea61abfa68 Merge pull request #23272 from basepi/salt-ssh.minion.config.19114
[2014.7] Allow salt-ssh minion config overrides via master config and roster
2015-05-05 15:28:47 -06:00
Colton Myers
c223309bb7 Add versionadded 2015-05-05 12:44:50 -06:00
Mike Place
4f760dd9cb Merge pull request #23347 from basepi/salt-ssh.functionwrapper.contains.19114
[2014.7] Salt-SSH Backport FunctionWrapper.__contains__
2015-05-05 08:13:20 -06:00
Nicole Thomas
02658b1e60 Merge pull request #23344 from cachedout/issue_22742
Explicitely set file_client on master
2015-05-04 17:21:48 -06:00
Colton Myers
30595e3ff7 Backport FunctionWrapper.__contains__
Otherwise `if 'config.get' in __salt__` fails becaues it tries to
iterate over a list (starting with 0, 1, 2, etc)
2015-05-04 16:39:23 -06:00
Colton Myers
be7407feae Lint 2015-05-04 16:18:30 -06:00
Colton Myers
c2c337567e Missing comma 2015-05-04 15:36:33 -06:00
Colton Myers
8e3e8e073a Pass the minion_opts through the FunctionWrapper 2015-05-04 15:33:39 -06:00
Colton Myers
cb69cd07de Match the master config template in the master config reference 2015-05-04 15:05:21 -06:00
Colton Myers
87fc3161f9 Add Salt-SSH section to master config template 2015-05-04 15:05:12 -06:00
Colton Myers
91dd9dcbdc Add ssh_minion_opts to master config ref 2015-05-04 15:00:28 -06:00
Thomas S Hatch
ba7605d1cb Merge pull request #23318 from cellscape/honor-seed-argument
Honor seed argument in LXC container initializaton
2015-05-04 14:58:12 -06:00
Thomas S Hatch
4ac4509c57 Merge pull request #23307 from jfindlay/fix_locale_gen
check for /etc/locale.gen
2015-05-04 14:56:32 -06:00
Colton Myers
c273ea14c6 Add minion config to salt-ssh doc 2015-05-04 14:48:19 -06:00
Colton Myers
a0b6b760c3 Add minion_opts to roster docs 2015-05-04 14:46:16 -06:00
Colton Myers
5212c35260 Accept minion_opts from the target information
Rosters can now define minion_opts under the host info
2015-05-04 14:37:31 -06:00
Mike Place
5adc96ce7f Explicitely set file_client on master
Failure to do so will break mine calls from the pillar. Closes #22742
2015-05-04 14:27:41 -06:00
Nicole Thomas
f790f42ed6 Merge pull request #23324 from s0undt3ch/hotfix/bootstrap-script-2014.7
[2014.7] Update to the latest stable release of the bootstrap script v2015.05.04
2015-05-04 10:28:30 -06:00
Nicole Thomas
5487367baa Merge pull request #23329 from cro/cloud_verify_cert
Require requests to verify cert when talking to aliyun and proxmox cloud providers
2015-05-04 10:18:17 -06:00
C. R. Oldham
860d4b7338 Turn on ssl verify for requests. 2015-05-04 08:40:14 -06:00
Pedro Algarvio
6643e47ce5 Update to the latest stable release of the bootstrap script v2015.05.04
* Fix the configuration path for FreeBSD. #567/#552. Thanks Ronald van Zantvoort(The-Loeki).
* Fix non grouping support in POSIX sed. Thanks Ronald van Zantvoort(The-Loeki).
* Add Debian 8 support. Thanks Matt Black(mafrosis)
* Improve Debian version parsing. Thanks Mark Lee(malept)
* Make sure we update packages list one Chris Lea's PPA repository is added.
* Hard code the Debian Squeeze backports to the DE mirror since the main repository is down. Thanks @panticz. saltstack/salt-bootstrap#589.
* Only install git if not already installed. saltstack/salt-bootstrap#560
* Fix openSUSE 13.2 where we need to pass --replaceflags. Thanks Roman Inflianskas(rominf). saltstack/salt-bootstrap#504.
* Make sure that a recent enough requests package is installed in Debian/Ubuntu.
* Install tornado on git installs for the develop branch if necessary. saltstack/salt-bootstrap#580
* Add support for Ubuntu 15.04
2015-05-04 13:23:54 +01:00
cellscape
228b1be299 Honor seed argument in LXC container initializaton
Fixed #23311
2015-05-04 16:38:08 +06:00
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
Justin Findlay
101199ac14 check for /etc/locale.gen
Fixes #17245.
2015-05-03 15:21:55 -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
e2099b6e1b Process ssh_minion_opts from master config
Taking the minion config from the master system is dangerous, because
there may be an actual minion on the system and if we're not careful we
may override options we don't want to, resulting in hard-to-track-down
errors. Instead, allow for explicit minion config defined in the master.
2015-05-01 16:21:51 -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
Colton Myers
3b64214377 Revert "Work around bug in salt-ssh in config.get for gpg renderer"
This reverts commit d73979ee12.
2015-05-01 12:38:58 -06:00
Colton Myers
494953a208 Remove the strip (embracing multi-line YAML dump) 2015-05-01 12:36:51 -06:00
Colton Myers
fe87f0fe39 Dump multi-line yaml into the SHIM
Minion config will be larger now, width isn't enough to make sure it's
only a single line
2015-05-01 12:35:48 -06:00
Colton Myers
b751a7281c Inject local minion config into shim if available 2015-05-01 12:24:57 -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