Commit Graph

58272 Commits

Author SHA1 Message Date
Mike Place
83ae6a1432 Merge pull request #27632 from rallytime/bp-27539
Back-port #27539 to 2015.8
2015-10-02 13:28:39 -06:00
Mike Place
888e9bdf5d Merge pull request #27633 from rallytime/bp-27559
Back-port #27559 to 2015.8
2015-10-02 13:22:07 -06:00
Joseph Hall
8b7da5e469 Merge pull request #27579 from rallytime/fix-27463
Change boto_route53 region default to 'universal' to avoid problems with boto library
2015-10-02 12:56:17 -06:00
Ethan Moore
3f03815ada rebasing 2015-10-02 09:53:59 -06:00
rallytime
2b0afd0230 Add versionadded to new path option 2015-10-02 09:51:06 -06:00
Ethan Moore
e54afed73a moving path kwarg to end of function definition
added back debug entries that I removed previously
2015-10-02 09:50:24 -06:00
Mike Place
27fcecccbe Merge pull request #27612 from rallytime/fix-27609
Fix GCE external_ip stacktraces in 2015.5
2015-10-02 09:42:20 -06:00
Nicole Thomas
ce4c64a2e3 Merge pull request #27581 from tkwilliams/boto_secgroup_add_vpc_name
Add support for 'vpc_name' tag in boto_secgroup module and state
2015-10-02 09:40:40 -06:00
Mike Place
fb6f6b9ce4 Merge pull request #27624 from eyj/fix_wait_for_sync
Wait for sync is not passed to boto_route53 state
2015-10-02 09:37:44 -06:00
Mike Place
eb59cb8d1c Merge pull request #27614 from blueyed/doc-minor
doc: minor fixes to doc and comments
2015-10-02 09:34:02 -06:00
Mike Place
61f8a6f39f Merge pull request #27627 from eyj/pr-instance-attribute
Fix crash in boto_asg.get_instances if the requested attribute is None
2015-10-02 09:33:32 -06:00
EYJ
03d7c6af3d Fix crash in boto_asg.get_instances if the requested attribute may be None 2015-10-02 15:34:38 +02:00
Nasenbaer
ed6a8c0aa6 Wait for sync is not passed to boto_route53 state 2015-10-02 15:16:31 +02:00
jacobhammons
764d70af79 Merge pull request #27616 from jacobhammons/win-repo-docs
Updated windows software repository docs
2015-10-01 23:04:37 -06:00
Jacob Hammons
1c8b32ce26 Updated windows software repository docs 2015-10-01 22:02:01 -06:00
Tom Williams
159cccf43f Faulty check logic around optional params 2015-10-01 22:52:36 -04:00
Tom Williams
84ab0bbd74 One last bug to squash. Seriously. It's the last one. Ever!
- fixed param vpc_id being passed where vpc_name was intended.
2015-10-01 22:12:19 -04:00
Tom Williams
002cbf5cde Grrr. Add back the import of SaltInvocationError that pylint wanted me to remove :) 2015-10-01 21:48:13 -04:00
Tom Williams
0671c0d8d9 Consolidate some redundant code - thanks @ryan-lane ! 2015-10-01 20:57:44 -04:00
Tom Williams
fae1199276 Followed @ryan-lane's suggestion to remove duplicated code from boto_vpc and instead call into that module 2015-10-01 20:11:50 -04:00
Daniel Hahler
98a8c0f055 doc: minor fixes to doc and comments 2015-10-02 01:18:32 +02:00
rallytime
8dc047dc18 If external_up is set to None, don't stacktrace, just use the private ip. 2015-10-01 16:37:17 -06:00
rallytime
2ebf790f9f [salt-cloud] gce: don't stacktrace if Ephemeral is given instead of ephemeral 2015-10-01 16:00:09 -06: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
c84a1edc1b Merge pull request #27568 from jacobhammons/man-pages-five
regenerated man pages
2015-10-01 09:39:37 -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
Justin Findlay
304dc68f7f Merge pull request #27582 from jfindlay/2015.5
add 2015.5.6 release notes
2015-09-30 16:33:48 -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
Justin Findlay
4f0d55cda6 add 2015.5.6 release notes 2015-09-30 16:29:57 -06: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