valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,346 Commits 24 Branches 182 Tags 341 MiB
7f968ddb72
Commit Graph

74346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clint Armstrong
dd50705e58 fix #36814 2016-10-10 16:54:33 -04:00
Nicole Thomas
86ac8bd680 Merge pull request #36885 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-10 13:30:25 -06:00
Erik Johnson
cb92f8656a Fix traceback on "salt-ssh -h" (#36888) 
This code was originally added to the option parser in 423a356. It was
probably intended to be a single string continued onto multiple lines
via parenthesis, but the use of a comma turns this into a tuple, which
causes a traceback when "salt-ssh -h" is run.
 2016-10-10 13:30:05 -06:00
Erik Johnson
1c0ba8012c salt-ssh: Try "command -v" before falling back to "which" (#36889) 
This makes salt-ssh work better on minimal installs such as the CentOS 7
container images from linuxcontainers.org.
 2016-10-10 13:28:41 -06:00
Jacob Hammons
dff93f89ff Update list of RC build platforms, fix example (#36887) 2016-10-10 11:36:48 -06:00
Nicole Thomas
e2de78b130 Merge pull request #36884 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-10 11:22:23 -06:00
Nicole Thomas
e76f05ec48 Fix KeyError when loading runit execution module (#36882) 
Fixes #36865
 2016-10-10 10:59:35 -06:00
Nicole Thomas
3bb1bcc854 Merge pull request #36886 from rallytime/bp-36874 
Back-port #36874 to carbon
 2016-10-10 10:28:11 -06:00
m03
077645d054 Fix shell_info docstring example 2016-10-10 10:25:12 -06:00
rallytime
c09b9d6e6a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-10 10:21:04 -06:00
rallytime
9ae34b2329 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/beacons/index.rst
 2016-10-10 10:19:50 -06:00
Jorge Schrauwen
0b304e75a3 missing docs for salt.modules.apcups (#36863) 2016-10-08 19:51:45 -06:00
Super-User
fb4d70dbda (re)introduce minimal weighing to get_fqhostname 2016-10-09 01:08:08 +02:00
Super-User
bd191f349f module.x509 did not handle mine.get output properly 2016-10-08 16:30:02 +02:00
Erik Johnson
85eea4d6ee fileclient: Change queryarg comparison from None to simple boolean check (#36830) 
When there are no queryargs, the ``query`` attribute is an empty string,
not ``None``.
 2016-10-08 07:50:49 -06:00
Mike Place
9a819693ff Merge pull request #36845 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-08 14:29:10 +09:00
Mike Place
3ce4897b97 Merge pull request #36857 from terminalmage/systemd-unit-tests 
Add unit tests for systemd scope usage
 2016-10-08 14:22:05 +09:00
Erik Johnson
7c78d6f419 Add unit tests for systemd scope usage 2016-10-07 17:35:09 -05:00
rallytime
2e34277b65 Add '--no-psqlrc' option to new-to-carbon postgres unit test 2016-10-07 16:10:57 -06:00
Nicole Thomas
6a6bdf3e3f Merge pull request #36853 from rallytime/bp-33939 
Back-port #33939 to 2016.3
 2016-10-07 15:44:32 -06:00
Nicole Thomas
0d78c70a30 Merge pull request #36850 from rallytime/bp-36736 
Back-port #36736 to carbon
 2016-10-07 15:44:18 -06:00
Nicole Thomas
01348bde18 Merge pull request #36852 from rallytime/bp-36743 
Back-port #36743 to 2016.3
 2016-10-07 15:35:43 -06:00
Bartosz Burclaf
efbc09c1a6 Removed !-password check 2016-10-07 13:57:18 -06:00
Jacob Hammons
d179423a23 Doc updates for Carbon release candidate (#36847) 2016-10-07 13:50:03 -06:00
do3meli
899130d11f corrected OS Name in module load error message 2016-10-07 13:40:00 -06:00
m03
b7f5f82cf6 Fix issue 36679 win_servermanager failure 2016-10-07 13:25:55 -06:00
rallytime
af044fd889 Pylint fix 2016-10-07 13:22:02 -06:00
Nicole Thomas
0b7661244d Merge pull request #36844 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-07 13:20:31 -06:00
C. R. Oldham
dc5d821be6 Merge pull request #36835 from jfindlay/beacon_doc 
unify and expand beacon documentation
 2016-10-07 09:59:34 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
 2016-10-07 09:51:21 -06:00
rallytime
1c3a9a3ee9 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/minion.py
  - salt/output/highstate.py
 2016-10-07 09:39:48 -06:00
Justin Findlay
b2eccdefd5 doc.topics.beacons: reflow text at 80 chars 2016-10-06 17:06:10 -06:00
Justin Findlay
b181f9890d doc.topics.{reactor|beacons}: unify examples, many minor edits 2016-10-06 17:06:10 -06:00
Justin Findlay
28b4e30009 doc.glossary: use parenthesis 2016-10-06 16:17:22 -06:00
Justin Findlay
82cf39db00 doc.glossary: add JID 2016-10-06 16:17:22 -06:00
Justin Findlay
cc071b75cb doc.glossary: add idempotent 2016-10-06 16:17:22 -06:00
C. R. Oldham
0df63da0ae Refactor repeat of _spawn_minions 2016-10-06 14:20:29 -06:00
C. R. Oldham
b7f9eb7864 Fix test. 2016-10-06 14:20:29 -06:00
C. R. Oldham
ea886434ad Lint, thought I caught this before 2016-10-06 14:20:29 -06:00
C. R. Oldham
b019c9967d Adapt MinionManager for Proxy Minions. Also default location of proxy minion PID files to include the minion_id. 
It's much more common to run multiple proxy minions on a machine and by default the proxy would abort because
of pidfile collision.
 2016-10-06 14:20:29 -06:00
Mike Place
1284de27fc Merge pull request #36789 from maximeguillet/fix-psqlrc-pg9.6 
Fix behavior of psql -c option with postgresql 9.6
 2016-10-06 20:24:51 +09:00
Mike Place
a1d59f4d2f Merge pull request #36797 from cachedout/issue_36579 
Error on reaction with missing SLS file
 2016-10-06 20:19:27 +09:00
Mike Place
b75130be2d Merge pull request #36803 from gtmanfred/2016.3 
do not load libvirt pillar if certtool is unavailable
 2016-10-06 20:15:14 +09:00
Mike Place
3de1c132ca Merge pull request #36809 from twangboy/fix_win_service 
Fix problem with missing information
 2016-10-06 19:44:01 +09:00
Mike Place
39148dc711 Merge pull request #36815 from BenoitKnecht/fix-glance-image-present-state-2016.3 
Fix glance.image_present state
 2016-10-06 19:29:44 +09:00
Benoît Knecht
342eee444d states: glance: handle image list instead of dict 
glance.image_list now returns a list of images instead of a dict, but
the glance state tried to use the values() method on it either way,
leading to the following exception:

  An exception occurred in this state: Traceback (most recent call last):
    File "/usr/lib/python2.7/dist-packages/salt/state.py", line 1733, in call
      **cdata['kwargs'])
    File "/usr/lib/python2.7/dist-packages/salt/loader.py", line 1652, in wrapper
      return f(*args, **kwargs)
    File "/usr/lib/python2.7/dist-packages/salt/states/glance.py", line 155, in image_present
      image, msg = _find_image(name)
    File "/usr/lib/python2.7/dist-packages/salt/states/glance.py", line 60, in _find_image
      return images_dict.values()[0], 'Found image {0}'.format(name)
  AttributeError: 'list' object has no attribute 'values'

This commit makes sure that we're always working with a list, even if
glance.image_list returns a dict.
 2016-10-06 10:09:45 +02:00
Benoît Knecht
02b91ecf15 states: glance: import keystone exceptions from new location 
keystoneclient.apiclient.exceptions has been deprecated since 0.7.1 in
favor of keystoneclient.exceptions, and has been removed in 2.1.0, so
the glance state fails to load with recent versions of keystoneclient.

This commit tries to import from keystoneclient.exceptions first, and
falls back to keystoneclient.apiclient.exceptions if that fails.
 2016-10-06 10:06:52 +02:00
twangboy
5854922d76 Fix problem with missing information 2016-10-05 15:19:52 -06:00
Erik Johnson
7d60e73308 Fix pillar merging when ext_pillar_first is enabled 
ext_pillar was being merged into pillar, when it should have been the
other way around. This means that when ext_pillar_first was enabled,
pillar keys with the same name as ones defined in ext_pillar were being
lost instead of overriding ext_pillar.
 2016-10-05 15:57:42 -05:00
Daniel Wallace
2183737085 do not load libvirt pillar if certtool is unavailable 2016-10-05 12:28:19 -05:00