Commit Graph

13197 Commits

Author SHA1 Message Date
Thomas S Hatch
6650c251a4 Merge pull request #5025 from basepi/statecheck4904
Fix check_state_result for salt-call --local, Fix #4904
2013-05-14 16:33:15 -07:00
Thomas S Hatch
70f1ca3903 Fix #5024 2013-05-14 17:32:13 -06:00
Colton Myers
08e471dbae Fix check_state_result for salt-call --local, Fix #4904 2013-05-14 17:26:08 -06:00
Thomas S Hatch
c4d44135bf Merge pull request #5020 from s0undt3ch/hotfix/lint-and-formatting
Lint + Formating + PEP-8
2013-05-14 10:34:51 -07:00
Pedro Algarvio
2769724c17 No need to define logger instead if log(which is properly, not signaled, by pylint). PEP-8 formatting fixes. 2013-05-14 18:28:39 +01:00
Thomas S Hatch
4b5c3e6106 Only pass the retcode out to salt-call if retcode_passthrough is
set, first fix for #4904
2013-05-13 07:59:28 -06:00
Thomas S Hatch
a745edf09e Merge pull request #5021 from basepi/recurse5013
Handle leading | in fileclient, Fix #5013
2013-05-14 16:07:21 -07:00
Colton Myers
70a8ce42d3 Merge pull request #5023 from hulu/stateconf-copyedits
salt.renderers.stateconf.rst: add more missing spaces before open parens
2013-05-14 15:17:04 -07:00
Chris Rebert
4f4fe73d05 salt.renderers.stateconf.rst: add more missing spaces before open parens 2013-05-14 14:38:19 -07:00
Joseph Hall
06f03a841f Merge pull request #5022 from hulu/stateconf-copyedits
some copyediting of the stateconf renderer docs
2013-05-14 14:34:01 -07:00
Chris Rebert
571fdd7299 some copyediting of the stateconf renderer docs 2013-05-14 14:32:34 -07:00
Colton Myers
99ecd9f587 Handle leading | in fileclient, Fix #5013 2013-05-14 14:40:07 -06:00
Colton Myers
42042e0b6f Fix some pep8 2013-05-14 14:36:56 -06:00
Thomas S Hatch
9c85eaa8d2 Add index to salt cloud controller 2013-05-13 04:41:53 -06:00
Thomas S Hatch
84f7fd442f Add salt/virt to toc 2013-05-13 03:34:45 -06:00
Thomas S Hatch
3f1fc94ed0 Fix fomatting 2013-05-14 09:09:08 -06:00
Thomas S Hatch
0c2f113ccb Add valid_id commit to vulnerability report 2013-05-14 09:06:51 -06:00
Thomas S Hatch
357749303f Merge pull request #5014 from basepi/checkdir4777
Use clean/require in file._check_directory state, Fix #4777
2013-05-14 07:46:45 -07:00
Thomas S Hatch
6f2ff1ef61 Add doc on salt virt ethernet control 2013-05-14 00:41:06 -06:00
Thomas S Hatch
c1a25bd619 Start on cloud controller tutorial 2013-05-14 00:40:42 -06:00
Thomas S Hatch
0f308aa1cb Add nic option to virt runner 2013-05-14 00:40:17 -06:00
Colton Myers
213392c8d4 Merge pull request #5016 from UtahDave/develop
Fix problem with cmd.run with onlyif and unless
2013-05-13 16:30:32 -07:00
David Boucha
7f9d21d7d9 pop values directly into new var 2013-05-13 17:29:29 -06:00
Colton Myers
a0d8215823 Merge pull request #5015 from hulu/git-not-defined
Check for existance of git-python before checking it's version attribute
2013-05-13 16:29:27 -07:00
David Boucha
bc6742936e Fix problem with cmd.run with onlyif and unless 2013-05-13 17:24:39 -06:00
Joseph Hall
3acfd23c36 Merge pull request #5011 from virtua-network/develop
pkg/smartos : add compatible manifests for the SmartOS platform
2013-05-13 16:03:50 -07:00
David Lindquist
6019d0ca01 Check for existance of git-python before checking it's version attribute 2013-05-13 15:46:32 -07:00
Colton Myers
aa779757a6 Handle clean logic even if recurse is not set 2013-05-13 15:24:50 -06:00
Joseph Hall
4ea70b9b85 Merge pull request #5012 from UtahDave/add_ip4_win
Add ip4 grain for Windows.
2013-05-13 14:15:20 -07:00
Colton Myers
3f9b6be5d5 Use clean/require in file._check_directory state, Fix #4777
Actually check for file removal if test=True
2013-05-13 15:10:29 -06:00
David Boucha
8b90ad920c Get Windows interfaces if on Windows 2013-05-13 14:53:50 -06:00
David Boucha
056c485798 Windows supports this now 2013-05-13 14:51:30 -06:00
Colton Myers
573dc7daab Merge pull request #5008 from UtahDave/develop
lower "which" function search failures to trace
2013-05-13 13:22:27 -07:00
mguegan
737b4e0fb2 pkg/smartos : add compatible manifests for the SmartOS platform
Manifests in pkg/solaris are using /etc/salt which is innapropriate
for SmartOS design (/etc is removed @reboot). I suggest to add a
new directory in order to preserve existing Solaris installations
(and SmartOS one which are based on those manifests).
2013-05-13 22:17:35 +02:00
David Boucha
eacab1bf31 lower "which" function search failures to trace
having it at log.debug was dumping out too much
info
2013-05-13 11:06:31 -06:00
David Boucha
bbeb737761 Merge pull request #5000 from terminalmage/issue3390
Add "pkgs" support for pkg.purged, pkg.removed states
2013-05-13 08:22:02 -07:00
Thomas S Hatch
1acac2e416 Merge pull request #5002 from davea/fix_cmd_line_pillar
Don't try and re-parse command line arguments in state.highstate
2013-05-13 07:41:44 -07:00
Dave Arter
88000977a5 Don't try and re-parse command line arguments in state.highstate
Since 0a87bb8, all command line arguments are parsed as YAML. Thus,
attempting to re-parse a kwarg value as YAML or JSON will fail.
2013-05-13 10:00:33 +01:00
Erik Johnson
9d3b2379a5 Modify pkg.removed, pkg.purged to accept 'pkgs' arg
Also moved the package remove/purge code into a single common function.
2013-05-12 22:48:39 -05:00
Pedro Algarvio
a5a58fbb61 Remove left over print. 2013-05-13 02:10:37 +01:00
Erik Johnson
28fdf3ed44 zypper: multi-pkg for remove/purge, optimizations
This commit brings support for the "pkgs" argument to the remove and
purge functions. In addition, the use of __context__ has been added to
list_pkgs. All functions which modify the package database clear the
__context__ variable before running list_pkgs again to ensure that
changes are detected.
2013-05-12 19:19:35 -05:00
Erik Johnson
ee972a9c22 yumpkg{,5}: multi-pkg for remove/purge, optimizations
This commit brings support for the "pkgs" argument to the remove and
purge functions. In addition, the use of __context__ has been added to
list_pkgs. All functions which modify the package database clear the
__context__ variable before running list_pkgs again to ensure that
changes are detected.
2013-05-12 19:19:35 -05:00
Erik Johnson
6fb0455898 pacman: multi-pkg for remove/purge, optimizations
This commit brings support for the "pkgs" argument to the remove and
purge functions. In addition, the use of __context__ has been added to
list_pkgs. All functions which modify the package database clear the
__context__ variable before running list_pkgs again to ensure that
changes are detected.
2013-05-12 19:19:35 -05:00
Erik Johnson
4b0db1a126 Require "sources" param for solaris pkg_add 2013-05-12 19:19:34 -05:00
Erik Johnson
018c9c21e6 pkgutil: multi-pkg for remove/purge, optimizations
This commit brings support for the "pkgs" argument to the remove and
purge functions. In addition, the use of __context__ has been added to
list_pkgs. All functions which modify the package database clear the
__context__ variable before running list_pkgs again to ensure that
changes are detected.
2013-05-12 19:19:34 -05:00
Erik Johnson
7333a82fb7 remove solaris guards from parse_targets
pkgutil supports the 'name' and 'pkgs' arguments, so these guards
effectively keep pkgutil from working. They have been removed. Special
handling for solaris pkg_add should be done to gracefully handle an
attempt to use 'name' or 'pkgs' instead of 'sources' on package
installs, if needed.
2013-05-12 19:19:34 -05:00
Erik Johnson
42a4cefd11 openbsdpkg: multi-pkg for remove/purge, optimizations
This commit brings support for the "pkgs" argument to the remove and
purge functions. In addition, the use of __context__ has been added to
list_pkgs. All functions which modify the package database clear the
__context__ variable before running list_pkgs again to ensure that
changes are detected.

The process by which packages are listed has been simplified, as well.

Missing comparison functions were also added.
2013-05-12 19:19:34 -05:00
Erik Johnson
4e359d00b4 solarispkg: multi-pkg for remove/purge, optimizations
This commit brings support for the "pkgs" argument to the remove and
purge functions. In addition, the use of __context__ has been added to
list_pkgs. All functions which modify the package database clear the
__context__ variable before running list_pkgs again to ensure that
changes are detected.
2013-05-12 19:19:34 -05:00
Erik Johnson
32027a1beb win_pkg: multi-pkg for remove/purge, optimizations
This commit brings support for the "pkgs" argument to the remove and
purge functions. In addition, the use of __context__ has been added to
list_pkgs. All functions which modify the package database clear the
__context__ variable before running list_pkgs again to ensure that
changes are detected.
2013-05-12 19:19:34 -05:00
Erik Johnson
996619d24e PEP8 2013-05-12 19:19:34 -05:00