Commit Graph

58084 Commits

Author SHA1 Message Date
Daniel Hahler
98a8c0f055 doc: minor fixes to doc and comments 2015-10-02 01:18:32 +02:00
Tom Williams
3a38a440b7 Merge remote-tracking branch 'upstream/2015.8' into boto_secgroup_add_vpc_name 2015-10-01 17:32:13 -04:00
Tom Williams
f7ef0bcd4c Fixups for picayune pylint pedantery :) 2015-10-01 16:29:57 -04:00
Daniel Hahler
b1442ac904 dockerng: handle None in container.Names
`Names` might be `None`, and would cause this error:

    [ERROR   ] An exception occurred in this state: Traceback (most recent call last):
      File "/usr/lib/python2.7/dist-packages/salt/state.py", line 1591, in call
        **cdata['kwargs'])
      File "/usr/lib/python2.7/dist-packages/salt/states/dockerng.py", line 1386, in running
        if name not in __salt__['dockerng.list_containers'](all=True):
      File "/usr/lib/python2.7/dist-packages/salt/modules/dockerng.py", line 2136, in list_containers
        for c_name in [x.lstrip('/') for x in item.get('Names', []) or []]:
    TypeError: 'NoneType' object is not iterable

    > /usr/lib/python2.7/dist-packages/salt/modules/dockerng.py(2136)list_containers()
       2135     for item in six.itervalues(ps_(all=kwargs.get('all', False))):
    -> 2136         for c_name in [x.lstrip('/') for x in item.get('Names', [])]:
       2137             ret.add(c_name)

    ipdb> item.get('Names') is None
    True
    ipdb> item
    {u'Status': u'Dead', u'Image': u'gliderlabs/logspout:v2', …
    u'Names': None, … }
2015-10-01 19:32:18 +02:00
Daniel Hahler
53c6e3b3de dockerng: use docker.version=auto by default
Although there is a version check for docker-py, it still can fail in
the case of downgrading docker-py (e.g. when going to `prod` from
`dev`):

    [DEBUG   ] "GET /v1.19/images/json?only_ids=0&all=0 HTTP/1.1" 404 72
    [ERROR   ] An exception occurred in this state: Traceback (most recent call last):
      File "/usr/lib/python2.7/dist-packages/salt/state.py", line 1591, in call
        **cdata['kwargs'])
      File "/usr/lib/python2.7/dist-packages/salt/states/dockerng.py", line 447, in image_present
        all_tags = __salt__['dockerng.list_tags']()
      File "/usr/lib/python2.7/dist-packages/salt/modules/dockerng.py", line 2161, in list_tags
        for item in six.itervalues(images()):
      File "/usr/lib/python2.7/dist-packages/salt/modules/dockerng.py", line 1976, in images
        response = _client_wrapper('images', all=kwargs.get('all', False))
      File "/usr/lib/python2.7/dist-packages/salt/modules/dockerng.py", line 577, in wrapper
        return wrapped(*args, **salt.utils.clean_kwargs(**kwargs))
      File "/usr/lib/python2.7/dist-packages/salt/modules/dockerng.py", line 844, in _client_wrapper
        exc.explanation)
    CommandExecutionError: Error 404: client and server don't have same version (client : 1.19, server: 1.18)

TEST CASE:
 - Install docker-py 1.4.0
 - Have a state to downgrade it

    docker-py:
      pip.installed:
        - name: docker-py==1.2.2
        - require:
          - pkg: python-pip
        - reload_modules: true

dockerng will be loaded, but then cause the above 404 errors.

This can be fixed by using `version=auto` for the `docker.Client`, which
could also be provided in the Salt config (`docker.version`).

The support for `version=auto` has been added in docker-py 1.1.0.
2015-10-01 18:04:03 +02:00
Nicole Thomas
db963b7864 Merge pull request #27569 from lomeroe/fix_boto_elb
boto_vpc.get_subnet_association now returns a dict w/key of vpc_id, a…
2015-10-01 10:03:06 -06:00
Mike Place
b269cd4754 Merge pull request #27567 from whiteinge/psutil-version-fix
Use getattr to fetch psutil.version_info
2015-10-01 09:39:59 -06:00
Mike Place
9cc69e2440 Merge pull request #27583 from tkwilliams/fix_zypper
Fixup zypper module
2015-10-01 09:38:53 -06:00
Mike Place
5ca7e72c70 Merge pull request #27597 from blueyed/gitfs-remove-unused-bad_per_remote_conf
gitfs: remove unused variable "bad_per_remote_conf"
2015-10-01 09:38:15 -06:00
Daniel Hahler
58af4d68f0 gitfs: remove unused variable "bad_per_remote_conf"
According to `git log` it was never used.
2015-10-01 13:10:09 +02:00
Daniel Hahler
e70cbda490 gitfs: fix UnboundLocalError for 'msg'
When using an invalid gitfs configuration parameter, the following error
happened:

    [CRITICAL] Invalid gitfs configuration parameter 'foo' in remote https://example.com/. Valid parameters are: base, mountpoint, root, ssl_verify, name.
    [ERROR   ] An un-handled exception was caught by salt's global exception handler:
    UnboundLocalError: local variable 'msg' referenced before assignment
    Traceback (most recent call last):
      File "/usr/bin/salt-call", line 11, in <module>
        salt_call()
      …
      File "/usr/lib/python2.7/dist-packages/salt/utils/gitfs.py", line 202, in __init__
        msg += (
    UnboundLocalError: local variable 'msg' referenced before assignment
2015-10-01 13:03:22 +02:00
Colton Myers
9805bdeddf Merge pull request #27585 from lyft/cron-fix
Fix undefined variable in cron state module
2015-09-30 23:05:57 -06:00
Justin Findlay
87d86e4b3e Merge pull request #27588 from jfindlay/2015.8
add autogenerated 2015.8.1 release notes
2015-09-30 22:52:31 -06:00
Justin Findlay
f2eb20f26b add autogenerated 2015.8.1 release notes 2015-09-30 22:51:36 -06:00
Justin Findlay
f7510baf33 Merge pull request #27584 from jacobhammons/release-notes
added changes list to 2015.8.1 release notes
2015-09-30 22:32:47 -06:00
Tom Williams
35b66e28a3 Merge remote-tracking branch 'upstream/2015.8' into boto_secgroup_add_vpc_name 2015-09-30 21:06:37 -04:00
Ryan Lane
5474666b61 Fix undefined variable in cron state module 2015-09-30 17:25:06 -07:00
Jacob Hammons
ee4a3b3549 added changes list for 2015.8.1 2015-09-30 16:58:53 -06:00
Tom Williams
cdd44e4128 Fixup zypper module
- expected return type of pkg.latest was changed without updating zypper module
- unchecked list deref fixed
- "zypper info -t" out-of-date status field format has changed
2015-09-30 18:33:10 -04:00
Joseph Hall
1a31b19f15 Merge pull request #27575 from rallytime/fix-27532
Don't report existing instances as running only if they're actually terminated in EC2
2015-09-30 16:17:24 -06:00
Tom Williams
6770f721f8 Add support for 'vpc_name' tag in boto_secgroup module and state 2015-09-30 18:13:32 -04:00
Colton Myers
bee78a4e5c Merge pull request #27573 from basepi/salt-ssh.grains.minion_opts.27290
[2015.8] Use the custom yaml serializer for minion_opts for salt-ssh
2015-09-30 15:16:22 -06:00
rallytime
d5956132ef Change boto_route53 region default to 'universal' to avoid problems with boto library
Fixes #27463
2015-09-30 15:12:57 -06:00
rallytime
57c6535fc2 Make sure message is the most accurate. Instance may be stopped or shutting down. 2015-09-30 14:27:07 -06:00
rallytime
da6b4b3604 Don't report existing instances as running only if they're actually terminated
Fixes #27532
2015-09-30 14:19:33 -06:00
Colton Myers
0785438b3f Use the custom yaml serializer for minion_opts for salt-ssh
Without this change, any OrderedDict instances in our minion_opts (in
this case from grains) would be serialized to a format that
yaml.safe_load couldn't load. Configuration parsing would error out.
2015-09-30 13:58:54 -06:00
Ethan Moore
ae09a0fb61 boto_vpc.get_subnet_association now returns a dict w/key of vpc_id, adding code to handle the dict now
fixes #27543
2015-09-30 19:45:31 +00:00
Colton Myers
a4a53ecff5 Merge pull request #27514 from clinta/2015.8-27326
Recent Versions of OpenSSL don't allow importing incomplete PEMs
2015-09-30 13:33:12 -06:00
jacobhammons
6cf0228adc Merge pull request #27564 from jacobhammons/man-pages
Man pages
2015-09-30 13:29:37 -06:00
Seth House
7ebe9acc44 Use getattr to fetch psutil.version_info
This was preventing the docs for this module from getting built. I'm not
sure how or if that can be mocked using our normal docs Mock() system.

It may be better to use Salt's loader to build the docs rather than
mocking imports. Needs experimentation...
2015-09-30 13:15:24 -06:00
Jacob Hammons
cc37dc1087 updated version in salt.7 2015-09-30 13:01:11 -06:00
Jacob Hammons
a9dcb23a13 regenerated man pages for 2015.8.1 2015-09-30 12:58:34 -06:00
Clint Armstrong
515e62bfa7 change "None" to empty string 2015-09-30 14:41:55 -04:00
Mike Place
fd11e0cd95 Merge pull request #27522 from twangboy/fix_26629
Removed dependency on powershell to restart salt-minion
2015-09-30 10:19:29 -06:00
C. R. Oldham
eb76531e96 Merge pull request #27550 from rallytime/cloud-logging
[2015.8] Clean up salt-cloud logging and make it more useful
2015-09-30 09:48:53 -06:00
Mike Place
1f7ea7c764 Merge pull request #27517 from jacobhammons/install-docs
Updated install docs
2015-09-30 09:19:51 -06:00
Mike Place
2a4c11ae24 Merge pull request #27526 from eliasp/2015.8-modules.slack_notify-doc-params
Add missing newlines before param listing to fix doc rendering
2015-09-30 09:19:04 -06:00
Nicole Thomas
e5de9409c2 Merge pull request #27525 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-09-29 21:38:22 -06:00
rallytime
9e0fccd543 Don't commit private-ip changes from testing another bug... 2015-09-29 21:28:59 -06:00
rallytime
78c85fbb31 Add unit tests for new recursive function 2015-09-29 21:25:47 -06:00
rallytime
d9a2dc6bc5 [2015.8] Clean up salt-cloud logging and make it more useful 2015-09-29 19:38:38 -06:00
Colton Myers
1f3eb1c526 Remove useless mocked unit test 2015-09-29 18:23:46 -06:00
Elias Probst
204e66943f Add missing newlines before param listing to fix doc rendering 2015-09-29 23:33:49 +02:00
twangboy
163c54505d Fixed tests... hopefully 2015-09-29 15:28:23 -06:00
twangboy
dc8c01ed07 Fixed some lint 2015-09-29 15:19:19 -06:00
Colton Myers
73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/cloud/gce.rst
    doc/topics/windows/windows-package-manager.rst
    salt/client/ssh/state.py
    salt/cloud/clouds/ec2.py
    salt/modules/defaults.py
    salt/modules/file.py
    salt/utils/cloud.py
2015-09-29 14:56:41 -06:00
Jacob Hammons
167fd2304e Fixed a duplicated link ID 2015-09-29 14:08:48 -06:00
twangboy
2cb0f12696 Removed dependency on powershell to restart salt-minion
Fixes: #26629

Used net stop && net start instead of a powershell command to restart the
salt-minion service.
2015-09-29 14:01:10 -06:00
Justin Anderson
0e37fb3bd3 Merge pull request #27513 from terminalmage/fix-worktree-tests
Fix integration tests for worktree addition in git >= 2.6
2015-09-29 12:39:19 -06:00
Nicole Thomas
e974a3c8aa Merge pull request #27510 from rallytime/ryan-lane-test-fix
Merge #27475 with test fixes
2015-09-29 12:34:32 -06:00