valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,568 Commits 24 Branches 182 Tags 341 MiB
cc071b75cb
Commit Graph

69568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
cc071b75cb doc.glossary: add idempotent 2016-10-06 16:17:22 -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
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
Daniel Wallace
2183737085 do not load libvirt pillar if certtool is unavailable 2016-10-05 12:28:19 -05:00
Maxime Guillet
b59c23bef1 Fix one remaining postgresql tests linked to #36787. 2016-10-05 17:05:10 +02:00
Mike Place
6ce4653fa3
Error on reaction with missing SLS file 
Closes #36579
 2016-10-05 23:50:42 +09:00
Maxime Guillet
8b92ae2061 Fix postgresql tests using position in the argument list of psql. 
Some tests use position number in the argument list of psql command
to check their results. As #36787 add one element, next position
in the list must be used.
 2016-10-05 16:08:42 +02:00
Mike Place
81c935f210 Merge pull request #36754 from terminalmage/issue36738 
Base rpmdev-vercmp comparison result on retcode
 2016-10-05 21:50:23 +09:00
Maxime Guillet
21f2a17a07 Fix postgresql tests by adding --no-psqlrc option introduced by #36787. 2016-10-05 14:43:02 +02:00
Mike Place
4bdb997dae Merge pull request #36785 from cachedout/pr-36728 
Fixup merge forward #36728
 2016-10-05 20:02:16 +09:00
Maxime Guillet
574e30e915 Fix behavior of psql -c option with postgresql 9.6 
psql -c option no longer implies --no-psqlrc with postgresql 9.6, it must be set explicitly.

Fixes #36787.
 2016-10-05 12:19:54 +02:00
Mike Place
118ba8a772
Update alternatives module to strip newline chars 
Refs an error exposed by #36676
 2016-10-05 18:24:09 +09:00
Mike Place
90cca6b135 Merge pull request #36768 from gtmanfred/2016.3 
add __utils__ to vultr cloud provider
 2016-10-05 15:59:27 +09:00
Daniel Wallace
9df2fd11dd add __utils__ to vultr cloud provider 2016-10-04 12:26:36 -05:00
Mike Place
8ff69bf0c7 Merge pull request #36764 from cachedout/more_pip_test_fixing 
Another bit of detection for failed pip tests
 2016-10-04 22:05:29 +09:00
Mike Place
b9f5343449
Another bit of detection for failed pip tests 
Don't bail out if the download failed for some reason on the remote end
 2016-10-04 21:09:47 +09:00
Mike Place
5c0cbfc4c6 Merge pull request #36747 from jfindlay/arch_test 
modules.archive integration tests: check for gzip, rar
 2016-10-04 20:47:32 +09:00
Erik Johnson
928c99d2f7 Base rpmdev-vercmp comparison result on retcode 
This should be a more future-proof way of using this tool for version
comparison.
 2016-10-03 20:23:59 -05:00
Justin Findlay
b5fcca9983 modules.archive int tests: check for gzip, rar 
Similar to 8733586.
 2016-10-03 11:14:05 -06:00
Mike Place
93f1daa4ce Merge pull request #36744 from cachedout/fix_test_shutdown 
Fix issue where test suite could hang on shutdown
 2016-10-04 00:37:00 +09:00
Mike Place
cdf2a56564
Fix issue where test suite could hang on shutdown 
This is most common in the develop branch but could occur here as well.
 2016-10-03 23:37:05 +09:00
Mike Place
6fa9ec36d2 Merge pull request #36696 from cro/proxy_in_sls_id 
pass __proxy__ in state.sls_id
 2016-10-01 18:37:50 +09:00
Mike Place
e0b288feb3 Merge pull request #36716 from vutny/fix-ini-manage 
salt.modules.ini_manage: fix creating options in empty file
 2016-10-01 18:35:11 +09:00
Mike Place
97713b09f5 Merge pull request #36724 from rallytime/bp-36628 
Back-port #36628 to 2016.3
 2016-10-01 18:33:43 +09:00
Mike Place
8e7529764b Merge pull request #36725 from rallytime/bp-36643 
Back-port #36643 to 2016.3
 2016-10-01 18:33:13 +09:00
Mike Place
cf32c59b6a Merge pull request #36726 from rallytime/bp-36722 
Back-port #36722 to 2016.3
 2016-10-01 18:32:53 +09:00
rallytime
24b8bba145 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-30 16:13:08 -06:00
rallytime
5904cc04c6 Skip cmd_unzip test if salt.utils.which('zip') isn't available 
This test relies on running archive.cmd_zip in order to have something
to test running archive.cmd_unzip against. Some distros will have the
unzip binary available, but not the zip binary. We need to protect this
test against both so we don't have a false failure on trying to run
archive.cmd_zip.
 2016-09-30 16:02:42 -06:00
James Loosli
c5b8e442f9 a small, and unfortunate error 2016-09-30 16:01:38 -06:00
Yoram Hekma
3bb2cb6379 Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy 2016-09-30 15:59:21 -06:00
C. R. Oldham
891004f3be try/except for when __proxy__ is not injected. 2016-09-30 14:13:34 -06:00
Megan Wilhite
48d2b01e6c fix python26 archive zip module (#36719) 2016-09-30 13:14:01 -06:00
Denys Havrysh
73eb773fb0 salt.modules.ini_manage: fix creating options in empty file 2016-09-30 18:14:19 +03:00
Mike Place
7d022a3f39 Merge pull request #36699 from cachedout/fixup_36616 
Fix error in test
 2016-09-30 20:28:18 +09:00
Mike Place
16f5bb70ec
Remove line that checks against unordered keys 2016-09-30 20:24:49 +09:00
Mike Place
0aa35596c0 Merge pull request #36670 from jackywu/2016.3 
fix bug for including loopback addr
 2016-09-30 19:21:53 +09:00
Mike Place
a01a68d4be Merge pull request #36676 from vutny/redhat-alternatives-detect-fail 
`alternatives.install` state: detect `alternatives` command failed
 2016-09-30 19:15:45 +09:00
Mike Place
0e8c9abe8d Merge pull request #36694 from lorengordon/issue-36692 
Exposes `ignore_if_missing` to file.replace state module
 2016-09-30 19:12:26 +09:00
Mike Place
eab4fd563a Merge pull request #36700 from terminalmage/update-faq 
Update FAQ to use onchanges in minion restart example
 2016-09-30 19:08:30 +09:00
Erik Johnson
3d15eedfe0 Add additional information about onchanges/onchanges_in 2016-09-29 23:02:39 -05:00
Erik Johnson
57ecbe6c53 Update minion restart example to use onchanges instead of cmd.wait 2016-09-29 23:02:10 -05:00
Mike Place
0e9148293a
Fix error in test 
Introduced in #36616

cc: @cro
 2016-09-30 11:38:03 +09:00
Loren Gordon
35f3bb3a8a Exposes ignore_if_missing to file.replace state module 
Fixes #36692
 2016-09-29 18:27:12 -04:00
C. R. Oldham
e8e53d60be pass __proxy__ in state.sls_id 2016-09-29 13:59:23 -06:00
C. R. Oldham
c089ac6c67 Merge pull request #36686 from jfindlay/log_levels 
log levels doc: try long form table
 2016-09-29 12:21:47 -06:00
Nicole Thomas
e0a851b2f1 Merge pull request #36690 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-29 11:46:24 -06:00