valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
34,881 Commits 24 Branches 182 Tags 341 MiB
f3e4fe5440
Commit Graph

34881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Wallace
cab6cb79b7 closes #14577 2014-07-28 19:05:58 -05:00
Chris Rebert
6b339389a9 states.win_servermanager.installed(): fix string formatting 
************* Module salt.states.win_servermanager
salt/states/win_servermanager.py:41: [E1305(too-many-format-args), installed] Too many arguments for format string
 2014-07-28 16:45:10 -07:00
Daniel Wallace
143b0681d4 closes #14568 2014-07-28 18:43:32 -05:00
Chris Rebert
acb6fcd8fe states.dockerio.running(): fix string formatting in error message 
************* Module salt.states.dockerio
salt/states/dockerio.py:733: [E1305(too-many-format-args), running] Too many arguments for format string
 2014-07-28 16:41:35 -07:00
Daniel Wallace
c1dcd62aac closes #14561 
toggle [NUMBER [FLAG]] toggle the state of FLAG on partition
no third thing needed
 2014-07-28 18:40:02 -05:00
Chris Rebert
09a892861a fix string formatting in modules.win_update 
************* Module salt.modules.win_update
salt/modules/win_update.py:474: [E1305(too-many-format-args), list_updates] Too many arguments for format string
salt/modules/win_update.py:519: [E1305(too-many-format-args), download_updates] Too many arguments for format string
salt/modules/win_update.py:572: [E1305(too-many-format-args), install_updates] Too many arguments for format string
 2014-07-28 16:39:57 -07:00
Daniel Wallace
003fe8d144 closes #14560 2014-07-28 18:38:34 -05:00
Daniel Wallace
273dd411a4 closes #14557 2014-07-28 18:38:09 -05:00
Daniel Wallace
37470d81b4 closes #14558 2014-07-28 18:36:55 -05:00
Daniel Wallace
bbf0082017 closes #14556 2014-07-28 18:36:30 -05:00
Chris Rebert
9079618990 cleanup string formatting in modules.iptables 
************* Module salt.modules.iptables
salt/modules/iptables.py:489: [E1305(too-many-format-args), check] Too many arguments for format string
salt/modules/iptables.py:527: [E1305(too-many-format-args), check_chain] Too many arguments for format string
 2014-07-28 16:35:36 -07:00
Daniel Wallace
0a635d9ecd closes #14565 2014-07-28 18:34:54 -05:00
Chris Rebert
61a065175f fix gramar & typo in states.archive.extracted 2014-07-28 16:31:57 -07:00
Daniel Wallace
baf74a5d7b closes #14564 2014-07-28 18:30:46 -05:00
Daniel Wallace
fdde21a1fb closes #14566 2014-07-28 18:30:41 -05:00
Chris Rebert
dbd8663139 cleanup string formatting in modules.cmdmod 
************* Module salt.modules.cmdmod
salt/modules/cmdmod.py:253: [E1305(too-many-format-args), _run] Too many arguments for format string
 2014-07-28 16:27:21 -07:00
Chris Rebert
416ad35515 fix string formatting in fileserver.hgfs.__virtual__() 
************* Module salt.fileserver.hgfs
salt/fileserver/hgfs.py:73: [E1306(too-few-format-args), __virtual__] Not enough arguments for format string
 2014-07-28 16:24:35 -07:00
Chris Rebert
304c7f5df4 states.lvs_server.absent: fix string formatting 
************* Module salt.states.lvs_server
salt/states/lvs_server.py:152: [E1305(too-many-format-args), absent] Too many arguments for format string
 2014-07-28 16:12:25 -07:00
Chris Rebert
35d78ed11a cleanup string formatting in modules.tls.create_ca() 
************* Module salt.modules.tls
salt/modules/tls.py:431: [E1305(too-many-format-args), create_ca] Too many arguments for format string
 2014-07-28 16:04:23 -07:00
Chris Rebert
7229dd660d fix bad string formatting in minion.Minion.__init__() 
salt/minion.py:636: [E1305(too-many-format-args), Minion.__init__] Too many arguments for format string
 2014-07-28 15:51:52 -07:00
Chris Rebert
d1e31f655d fix bad string formatting in modules.win_system.set_computer_name() 
************* Module salt.modules.win_system
salt/modules/win_system.py:132: [E1305(too-many-format-args), set_computer_name] Too many arguments for format string
 2014-07-28 15:47:59 -07:00
Chris Rebert
fea2a0cdfe fix string formatting in modules.ini_manage 
************* Module salt.modules.ini_manage
salt/modules/ini_manage.py:90: [E1305(too-many-format-args), set_option] Too many arguments for format string
 2014-07-28 15:43:28 -07:00
Mike Place
7b14e03807 Fix typo 
Conflicts:
	salt/modules/pip.py

Conflicts:
	salt/modules/pip.py
 2014-07-28 15:29:45 -06:00
Pedro Algarvio
48b5a31703 Update to latest, v2014.07.27 bootstrap script. 
* Amazon Linux AMI 2010.xx is now explicitly not supported.
* Install the `salt-api` scripts if available when the `salt-master` is also installed.
* Added support for a configurable sleep time when starting, restarting and checking
  for enabled services.
* Drop the `tsflags` requirement for RHEL and RHEL based distributions.
* When sorting release files, oracle-release has higher priority than redhat-release.
* Distro Support Fixed:
  * Debian >= 7 uses system's python-requests package, not PIP
  * Install 'python-zypp' in SuSE and openSUSE(required by Salt's zypper module)
  * Only install EPEL on requiring distributions if not already installed
  * CentOS 7 now uses systemd and the script now properly handles it
  * systemd in openSUSE 12.2 complains if service does not contain `.service``
  * Properly detect openSUSE using `lsb_release
  * SLES 11 SP3 ships with both python-M2Crypto-0.22.* and python-m2crypto-0.21 and we
    will be asked which we want to install, even with --non-interactive. Let's try to
    install the higher version first and then the lower one in case of failure.
  * Allow some extra time on RHEL for the optionals repo check in case the repository
    subscription is being managed externally.
 2014-07-28 17:44:36 +01:00
C. R. Oldham
508a8c76f1 Merge pull request #14549 from scott-w/upstream 
Update documentation on rabbitmq_user
 2014-07-28 08:43:18 -06:00
Pedro Algarvio
c58ab503fc Merge pull request #14548 from mickep76/pepa-make-color-output-optional 
Make color output optional
 2014-07-28 15:22:51 +01:00
Scott Walton
923bda842e Merge branch 'develop' of https://github.com/saltstack/salt into upstream 2014-07-28 13:41:55 +01:00
Scott Walton
b3c857745b Updated docstring #14484 2014-07-28 13:37:22 +01:00
Michael Persson
84c2488077 Fixed remaining pylint error 2014-07-28 14:09:15 +02:00
Michael Persson
64cb37323d Attempt at fixin pylint errors 2014-07-28 14:00:10 +02:00
Michael Persson
9822e121e5 Make color output optional 2014-07-28 12:43:38 +02:00
Mathieu Le Marec - Pasquet
4e1e150025 aptpkg: restore support for lenny... 2014-07-28 12:30:56 +02:00
Pedro Algarvio
f5afd434fe Merge pull request #14545 from techhat/pepa 
Pepa cleanups
 2014-07-28 08:57:55 +01:00
Joseph Hall
576db03638 Remove try/except blocks for imports that will always exist 2014-07-28 01:25:12 -06:00
Erik Johnson
fec7703ef3 Merge branch '2014.7' of https://github.com/saltstack/salt into develop 2014-07-27 22:06:17 -05:00
Erik Johnson
1858114027 Merge pull request #14541 from garethgreenaway/14530_ipv6_only_broken 
Fixing debian_ip.py per #14530.
 2014-07-27 21:53:39 -05:00
Gareth J. Greenaway
417c0740bc Fixing debian_ip.py per #14530. 2014-07-27 18:07:45 -07:00
Thomas S Hatch
4c52bc822a Merge pull request #14538 from makinacorpus/fix 
Fix pepa shortcircuiting all scripts args at it'simport time...
 2014-07-27 09:11:18 -06:00
Mathieu Le Marec - Pasquet
9a2460d999 Fix pepa shortcircuiting all scripts args at it'simport time... 
This kills salt-call & i think other salt scripts...
How can that hit develop !
 2014-07-27 16:20:27 +02:00
Erik Johnson
1fdf8905a9 Merge branch '2014.7' into develop 2014-07-26 19:17:42 -05:00
Erik Johnson
d21af7c8b6 Merge pull request #14534 from garethgreenaway/2014.7_14426_apt_virtual_pkg 
Switching the _get_virtual function to use pure python instead of a call to grep-available
 2014-07-26 19:16:57 -05:00
Gareth J. Greenaway
d73c76e847 Switching the _get_virtual function to use pure python instead of a call to grep-available. 2014-07-26 17:13:08 -07:00
Erik Johnson
0576a6831f Revert "Switching the _get_virtual function to use pure python instead of a call to grep-available." 
This reverts commit ad90bc4908, I'm having
Gareth re-open against 2014.7 so I can forward merge.
 2014-07-26 19:02:36 -05:00
Erik Johnson
bfb1f95887 Merge pull request #14531 from garethgreenaway/14426_apt_virtual_pkgs 
Fixes to aptpk.py for virtual packages
 2014-07-26 18:53:23 -05:00
Gareth J. Greenaway
ad90bc4908 Switching the _get_virtual function to use pure python instead of a call to grep-available. The issue with grep-available is that it doesn't know about virtual packages until they've been installed, if you're installing a virtual package via Salt which hasn't been installed before then the process will fail because the virtual package won't be in the list of available packages. Using the apt.cache module instead ensure that _get_virtual shows *all* virtual packages. 2014-07-26 10:24:04 -07:00
Thomas S Hatch
4a3c9a3a3f Merge pull request #14528 from hulu/use-isinstance-pkg 
pkg state: type(X) is Y ==> isinstance(X, Y)
 2014-07-25 21:54:27 -06:00
Thomas S Hatch
9a2a389c4e Merge pull request #14527 from hulu/use-isinstance-more-misc 
other misc modules: type(X) is Y ==> isinstance(X, Y)
 2014-07-25 21:53:56 -06:00
Thomas S Hatch
cf4a2f4453 Merge pull request #14526 from cvrebert/patch-4 
modules.mysql: simplify: type([]) ==> list
 2014-07-25 21:53:37 -06:00
Thomas S Hatch
c77bad86cd Merge pull request #14525 from hulu/use-isinstance-file 
file state: type(X) is Y ==> isinstance(X, Y)
 2014-07-25 21:53:25 -06:00
Thomas S Hatch
a9875fc6f7 Merge pull request #14524 from whiteinge/doc-hashutil 
Add docs for the hashutil module
 2014-07-25 21:52:57 -06:00