Sean Coates
5d10b87f77
Allow multiple identities for git
...
Sometimes, multiple private keys must be tried in order to get git
clone/pull/rebase to play nicely with a ssh connection. This patch
allows for this by allowing identities to be a list (but casting if it's
not).
A good example of this is when using private repositories that contain
submodules. GitHub does not allow the use of one key on multiple
repositories.
One small drawback is that there's not really a way to specify this
directly to git with the way the helper function works, so it just tries
them all until it succeeds.
Here's a demo repository for states, including links to protected
repositories, and their keys:
https://github.com/scoates/salt-multi-identity-git-states
2014-04-15 12:50:32 -04:00
Erik Johnson
47479a5d63
Remove unused import
2014-04-15 11:41:08 -05:00
Thomas S Hatch
0012eb00d8
Claen up stray chars
2014-04-15 10:03:17 -06:00
Thomas S Hatch
461ee7c994
Merge pull request #11925 from jcsp/fix-11919
...
Fix #11919 : handling exceptions in scheduled jobs
2014-04-15 09:58:38 -06:00
Joseph Hall
75a1a9bbc6
Merge pull request #12006 from JustinHead/develop
...
Add ability to define root disk size and private ip address allocation on Linode
2014-04-15 09:35:23 -06:00
Robert Steininger, IRS
604b98501f
PEP8 E302: expected 2 blank lines, found 0
2014-04-15 17:08:14 +02:00
Robert Steininger, IRS
5547fdb11a
PEP8 E711: comparison to None ...
2014-04-15 16:47:50 +02:00
Justin Head
73721e4e70
Add ability to define root disk size and private ip address allocation on Linode.
2014-04-15 09:46:49 -05:00
Robert Steininger
86c9e5388d
Update pillar.py
...
PEP8 W391: blank line at end of file
2014-04-15 16:41:07 +02:00
Robert Steininger, IRS
1f5ce56dc1
added runner pillar.show_pillar
2014-04-15 16:24:58 +02:00
Nicolas Delaby
19e7264d3c
Fix variable definition in wrong scope
...
File "/usr/lib/python2.7/dist-packages/salt/states/pkg.py", line 702
UnboundLocalError: local variable 'modified_hold' referenced before assignment
2014-04-15 15:14:51 +02:00
Pedro Algarvio
4ee7dc8a44
Fix remote reports downloads for minions grains matching.
2014-04-15 13:01:05 +01:00
Pedro Algarvio
2bc2c766df
Minor output changes
2014-04-15 12:40:05 +01:00
Pedro Algarvio
de86ed6303
The default value is not None
2014-04-15 12:35:48 +01:00
Pedro Algarvio
aad0e33af8
Fix and quote the compound matcher
2014-04-15 12:28:01 +01:00
Narcolapser
e8fd78e340
changed occurances of 'win_updates' to 'win_update' for consistency.
2014-04-15 12:22:36 +01:00
Pedro Algarvio
af42254974
Log the commands being executed
2014-04-15 12:18:45 +01:00
Narcolapser
05652d6509
changed 'download' and 'install' to 'downloaded' and 'installed' to make it match intended state better.
...
made some minor changes to how name is used. If you want to address a single category of updates, you can now do it through the name, making name less vestigial. But if you want to have multiple categories, you still must do it through categories. and as such, categories still exists as an independent entity.
2014-04-15 12:18:21 +01:00
Pedro Algarvio
7a945b438a
Allow matching minions using compound match(ID + grains)
2014-04-15 11:21:15 +01:00
Pedro Algarvio
704426f6d0
Merge pull request #12000 from s0undt3ch/develop
...
Fix compound example.
2014-04-15 11:20:38 +01:00
Pedro Algarvio
3cd612d2c4
Fix compound example.
...
Refs 11195cbd2d
2014-04-15 10:55:26 +01:00
Pedro Algarvio
5fbd38f40c
Merge pull request #11999 from s0undt3ch/hotfix/jenkins
...
Several Lint Fixes
2014-04-15 09:54:03 +01:00
Pedro Algarvio
afd63deacc
Fix PEP8 E303: too many blank lines (3)
2014-04-15 09:52:12 +01:00
Pedro Algarvio
ac4c042a55
Fix E8251 unexpected spaces around keyword / parameter equals
2014-04-15 09:51:16 +01:00
Pedro Algarvio
4d154daee4
Merge pull request #11998 from s0undt3ch/hotfix/npm-versionadded
...
Add `versionadded` to registry support in NPM. Refs #11926 .
2014-04-15 09:47:26 +01:00
Pedro Algarvio
8e8abc9d3b
Add versionadded to registry support in NPM. Refs #11926 .
2014-04-15 09:45:28 +01:00
Pedro Algarvio
244967a9b5
Allow for a 2nd system preparation sls file.
2014-04-15 09:42:33 +01:00
Pedro Algarvio
4f9ebe86eb
Merge pull request #11926 from vortec/npm_registry
...
npm state module: Add parameter to specify a custom NPM server
2014-04-15 09:40:59 +01:00
Pedro Algarvio
07d6dbcc2f
Merge pull request #11997 from whiteinge/salt-remove-external_ip
...
Moved the external_ip grain into salt-contrib
2014-04-15 08:35:05 +01:00
Seth House
ff35fef57c
Moved the external_ip grain into salt-contrib
2014-04-15 00:57:48 -06:00
Samuel Lai
84e29ac56f
Renamed method to better reflect what it does.
2014-04-15 12:35:55 +10:00
Samuel Lai
4642f56409
Fixed py-lint errors and also a merge bug with makedirs.
2014-04-15 12:33:07 +10:00
Thomas S Hatch
58b094ec1b
Add cli example
2014-04-14 18:57:42 -06:00
Thomas S Hatch
786ec2bf8c
Don't show stack traces for zmq in raet
2014-04-14 18:44:43 -06:00
Thomas S Hatch
26316569ed
set ioflo verbose to 0, the noise is no longer needed by default
2014-04-14 18:41:19 -06:00
Thomas S Hatch
5638596ead
the site reload is breaking macos states!!!!
...
@basepi, if this line is in 2014 [please cherrypick
2014-04-14 18:05:26 -06:00
Thomas S Hatch
3384d1b54a
Revert "Fix filelisting infinite loops"
...
This reverts commit ef8043bf0b
2014-04-14 17:18:20 -06:00
Erik Johnson
2a9c1deb17
Fix incorrect documentation
2014-04-14 17:18:48 -05:00
Thomas S Hatch
737940c1fc
Pass in correct names
2014-04-14 16:05:21 -06:00
Samuel Smith
89559e7001
Merge pull request #11992 from SmithSamuelM/sam_raet_36
...
Fix many external Raet refactor bugs
2014-04-14 15:39:25 -06:00
Samuel M Smith
425edb00e5
Merge remote-tracking branch 'upstream/develop' into sam_raet_36
2014-04-14 15:38:39 -06:00
Samuel M Smith
1c024ebc51
Fix External Raet REfactoring bugs
2014-04-14 15:37:47 -06:00
Thomas S Hatch
a4d65ae3b7
Fix indentation error in hold_pkg logic
2014-04-14 15:11:53 -06:00
Erik Johnson
685b3a6b4f
Fix traceback in docker.running state
...
This improves error reporting when invalidly-formatted input is
submitted from the docker.running state to the docker.start execution
fucntion.
2014-04-14 15:52:55 -05:00
Fabian Kochem
74d5591af7
new parameter: 'registry' for NPM module
2014-04-14 22:48:05 +02:00
Thomas S Hatch
f22c9aacf5
Merge pull request #11987 from toumorokoshi/showtimeout
...
Add show_timeout option to master config
2014-04-14 14:45:16 -06:00
Yusuke Tsutsumi
50b7bed030
fixes #1192 .
...
* Adding config file option for salt master configuration
2014-04-14 16:33:33 -04:00
Thomas S Hatch
fc09454d90
Merge pull request #11985 from toumorokoshi/specialCopy
...
Fixes #11966 , clearer interface for files.copy
2014-04-14 14:27:00 -06:00
Thomas S Hatch
e09cf64a99
Merge pull request #11984 from terminalmage/issue11889
...
Use /usr/local/etc/salt as fallback CONFIG_DIR only on FreeBSD
2014-04-14 14:23:12 -06:00
Thomas S Hatch
6a985a10ac
Merge pull request #11977 from simonfrid/feature/log_minion_pid
...
logging process id
2014-04-14 14:22:37 -06:00
