valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
54,454 Commits 24 Branches 182 Tags 341 MiB
94067fdc72
Commit Graph

54454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
94067fdc72 Merge pull request #24511 from jquast/rabbitmq-trailing-outp-fix 
bugfix: trailing "...done" in rabbitmq output
 2015-06-10 20:09:23 -06:00
Thomas S Hatch
16ffe20e1e Merge pull request #24316 from kev009/freebsd-disks-grain 
New disks grain
 2015-06-10 20:09:06 -06:00
Nicole Thomas
b8698235e1 Merge pull request #24576 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-10 13:40:02 -06:00
Colton Myers
d9db80cafd Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-10 12:01:43 -06:00
Nicole Thomas
3ec457beef Merge pull request #24571 from jacobhammons/24235 
Refs #24235
 2015-06-10 11:02:18 -06:00
Nicole Thomas
24c90c7c47 Merge pull request #24570 from msteed/py3-fix-arch-again 
network module: import ipaddress the same way as in other modules
 2015-06-10 10:57:58 -06:00
Nicole Thomas
03c1df312a Merge pull request #24516 from nmadhok/patch-1 
Make sure to catch TypeErrors
 2015-06-10 10:37:32 -06:00
Nicole Thomas
fe07eb5653 Merge pull request #24565 from pille/munin-ignore-broken-symlinks 
fix backtrace, when listing plugins
 2015-06-10 10:33:11 -06:00
Nicole Thomas
9988310a5d Merge pull request #24569 from iacopo-papalini/feature-#24559 
Fix Issue #24559 - salt-cloud - Azure - should be possible to specify…
 2015-06-10 09:56:31 -06:00
Jacob Hammons
8df5d53bb8 Refs #24235 2015-06-10 09:45:03 -06:00
Michael Steed
c390fc5932 import ipaddress the same way as in other modules 
Use 'import ipaddress' only in python 3. In python 2, import
salt.ext.ipaddress in order to avoid importing any third-party ipaddress
module from site-packages.
 2015-06-10 09:39:58 -06:00
Kevin Bowling
18ba0d8f28 Remove unneeded print 2015-06-10 08:38:18 -07:00
Iacopo Papalini
11e97fe616 Fix Issue #24559 - salt-cloud - Azure - should be possible to specify virtual network & subnet in profile 2015-06-10 16:17:54 +02:00
pille
8511a6c0a6 fix backtrace, when listing plugins 
munin usually symlinks its plugins in /etc/munin/plugins.
this catches the case that the symlink is broken.
 2015-06-10 14:44:47 +02:00
Nitin Madhok
dfa1cf2f23 Python3 compat 2015-06-10 05:15:56 -04:00
Jeff Quast
a154280b34 bugfix: trailing "...done" in rabbitmq output 
Problem
-----------

Some versions of rabbitmq (v3.4.1) does not output any final
"...done" line in output of listings, but the given salt code
unconditionally removed the final line of output, which may
often result in inconsistent behavior of dependent state
functions, where the final line has a value that is significant.

Solution
-----------

This bugfix changes this output manipulation to be conditional,
matching only lines of ``"Listing ..."`` as the first, and
``"...done"`` as the last.

Details
---------

In my environment::

    [rabbitmq@db01 ~]$ rabbitmqctl list_vhosts
    Listing vhosts ...
    /

This causes issues in, for example, a vhost is attempted to
be created for '/' that already exists, if that vhost happens
to be the last one listed in command output, it is thought
non-existent, resulting in state failure::

    Failure: rabbitmq_vhost_|-rabbitmq-vhost_|-/_|-present: Creating vhost "/" ...
    Error: vhost_already_exists: /
 2015-06-09 17:30:40 -07:00
Nicole Thomas
251c8f9f5f Merge pull request #24554 from lyft/pecl-module-fix 
Fix yes usage for pecl defaults
 2015-06-09 17:59:49 -06:00
Nicole Thomas
eced487657 Merge pull request #24542 from msteed/py3-fix-arch 
py3: fix arch failures
 2015-06-09 17:49:52 -06:00
Colton Myers
b5c5fe306d Merge pull request #24550 from basepi/six1.9upgrade 
Update six to 1.9.0
 2015-06-09 17:29:02 -06:00
Ryan Lane
56a9cfcf24 Fix yes usage for pecl defaults 2015-06-09 14:53:11 -07:00
Colton Myers
c9fc2479b0 Update six to 1.9.0 2015-06-09 15:24:12 -06:00
Colton Myers
359efdfc1c Merge pull request #24539 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-09 15:15:13 -06:00
Michael Steed
ddde2e1e39 use a realistic service sid in test_getsid() 2015-06-09 14:50:30 -06:00
Michael Steed
454e86a3e0 py3: fix salt/modules/win_service.py 
Don't rely on py2 behavior when comparing str/int
 2015-06-09 14:43:52 -06:00
Thomas S Hatch
1023f9b03f Merge pull request #24476 from thatch45/rpmbuild 
Rpmbuild
 2015-06-09 14:27:02 -06:00
Michael Steed
f9cf15ad46 fix new failures on ubuntu 14.04 2015-06-09 14:18:04 -06:00
Thomas S Hatch
dfef03f789 Merge pull request #24543 from rallytime/fix_centos_prkrepo_test 
The first arg in a state should always be name, and unfreeze name from salt/state.py
 2015-06-09 14:07:14 -06:00
Thomas S Hatch
dbd49b4acb Merge pull request #24535 from rallytime/bp-24518 
Back-port #24518 to 2015.5
 2015-06-09 14:06:18 -06:00
Nicole Thomas
a10ccc567a Merge pull request #24536 from lyft/route53-more-record-support 
Support all route53 record types
 2015-06-09 13:41:58 -06:00
Michael Steed
f725b8e4fe lint 2015-06-09 13:14:54 -06:00
Colton Myers
6e87ad383a lint 2015-06-09 12:45:36 -06:00
Colton Myers
52a694b9ac Python 3 compat 2015-06-09 12:45:31 -06:00
rallytime
eb02eee05e The first arg in a state should always be name, and unfreeze name from salt/state.py 
This should fix the problems with the CentOS* test failures.
 2015-06-09 12:39:12 -06:00
Michael Steed
0543f9aa0d fix tests/unit/modules/network_test.py 
Explicitly test salt.ext.ipaddress in test_is_private() and
test_is_loopback() as originally intended.
 2015-06-09 12:13:04 -06:00
Thomas S Hatch
bd64e4dfa1 Add pylint disable 2015-06-09 11:53:38 -06:00
Michael Steed
8669dacaf1 likewise in test_render_with_utf8_syntax_error() 2015-06-09 11:48:13 -06:00
Michael Steed
4b34b60623 set encoding in test_render_with_unicode_syntax_error() 2015-06-09 11:43:23 -06:00
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
 2015-06-09 11:41:07 -06:00
Colton Myers
485ed3cff9 Merge pull request #24538 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-06-09 11:27:20 -06:00
Colton Myers
6a8039d468 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/states/rabbitmq_vhost.py
 2015-06-09 11:26:09 -06:00
Michael Steed
ce5f14bb0e set encoding in test__unicode_match() 2015-06-09 11:19:51 -06:00
Ryan Lane
d8bf25c8ed Support all route53 record types 2015-06-09 10:18:03 -07:00
Michael Steed
f85a3e39da specify encoding in test_to_str() 2015-06-09 11:13:19 -06:00
Nicole Thomas
a652bef60b Merge pull request #24532 from makinacorpus/syntax_error2 
[CRITICAL] Fix syntax error
 2015-06-09 10:59:54 -06:00
rallytime
fc75197616 Pylint fix 2015-06-09 10:51:32 -06:00
Andrei Nistor
3e08840988 Update modules path for operating systems using systemd 2015-06-09 10:51:31 -06:00
Mathieu Le Marec - Pasquet
bff68cfec0 Fix syntax error 2015-06-09 17:55:37 +02:00
Justin Findlay
73e6388acd Merge pull request #24495 from jayeshka/rabbitmq_vhost_states-unit-test 
adding states/rabbitmq_vhost unit test case.
 2015-06-09 09:33:23 -06:00
Justin Findlay
bf1abccebe Merge pull request #24445 from jayeshka/pyrax_queues_states-unit-test 
adding states/pyrax_queues unit test case.
 2015-06-09 09:28:45 -06:00
Thomas S Hatch
0247e8d10d Merge pull request #24490 from aneeshusa/fix-pacman-list-upgrades 
Fix pacman.list_upgrades for new python_shell default.
 2015-06-09 09:13:16 -06:00