Samuel M Smith
1ace8ba719
Merge remote-tracking branch 'upstream/develop' into sam_raet_47
2014-06-23 17:54:06 -06:00
Samuel M Smith
d3183d58a0
enabled framer manger in minion.flo so minion initiates keep alive transactions
2014-06-23 17:52:32 -06:00
Samuel M Smith
066bf4d7c4
Added comments of where to modify behavior for presence support in RAET
2014-06-23 17:45:59 -06:00
Thomas S Hatch
ee291c382d
Merge pull request #11784 from obimod/patch-1
...
Prevent a keyerror when cloud mapping
2014-06-23 17:10:36 -06:00
Thomas S Hatch
fb8d6e575f
Merge pull request #13645 from garethgreenaway/schedule_state
...
Updates to schedule.py module and initial work to add a state to manage scheduled jobs
2014-06-23 17:05:05 -06:00
Joseph Hall
93f559def2
Merge pull request #13656 from rallytime/cloud_config_tests
...
More cloud profile config tests
2014-06-23 15:22:56 -06:00
rallytime
f821ccaa88
More cloud profile config tests
2014-06-23 15:19:11 -06:00
Thomas S Hatch
1b6dae128e
Merge pull request #13651 from spsoit/fixes_states_git_config_first_call
...
Fixes exception in states.git.config()
2014-06-23 15:15:49 -06:00
Joseph Hall
91e501bc45
Merge pull request #13655 from terminalmage/update-shar-script
...
Add additional information to the comments for the shar script
2014-06-23 15:06:49 -06:00
Erik Johnson
aa9ae49129
Add additional information to the comments for the shar script
2014-06-23 16:00:19 -05:00
Gareth J. Greenaway
c95452ba2f
fixing docstrings.
2014-06-23 13:42:36 -07:00
Gareth J. Greenaway
60fdd15233
lint fixes
2014-06-23 13:42:36 -07:00
Gareth J. Greenaway
221b2706d1
Changes to schedule.modify to show a diff of what has changes when a scheduled job is updated. Also some cleanup of duplicated code between add and modify, now moved into a common build_schedule_item function. Some additional cleanup and the initial work on a state to manage scheduled jobs.
2014-06-23 13:42:35 -07:00
Joseph Hall
fa2c1f5eef
Merge pull request #13653 from rallytime/cloud_config_tests
...
One more cloud config unit test
2014-06-23 12:30:28 -06:00
rallytime
d9f53a37f9
One more cloud config unit test
2014-06-23 12:17:26 -06:00
Joseph Hall
b46f08cc21
Merge pull request #13652 from sbellem/help-docs
...
Corrected tiny typo
2014-06-23 12:14:16 -06:00
Sylvain Bellemare
4260fab3be
Corrected tiny typo
2014-06-23 20:09:01 +02:00
Joseph Hall
edb7fb22c4
Merge pull request #13650 from holmboe/patch-2
...
Reflect the latest released version
2014-06-23 12:08:53 -06:00
Henrik Holmboe
e0a6a5a13e
Reflect the latest released version
...
I did this exact PR in #12695 the last time around. Luckily #12720 seems to take a stab at automating this. :)
2014-06-23 19:56:39 +02:00
Chad Heuschober
77836a173a
Fixes exception that fires when config_get() is called and user has no .gitconfig
2014-06-23 13:55:26 -04:00
Thomas S Hatch
3bfa509fea
Merge pull request #13649 from nlm/develop
...
fixes potential ext_pillar line mismatches
2014-06-23 11:55:23 -06:00
Thomas S Hatch
6602e33d9d
Merge pull request #13641 from terminalmage/docs
...
Clarify that templates are used on managed files
2014-06-23 11:39:09 -06:00
Thomas S Hatch
c5a656dbc2
Merge pull request #13636 from makinacorpus/f1
...
VT support for buildout mods
2014-06-23 11:38:41 -06:00
Thomas S Hatch
d5e75db0c7
Merge pull request #13634 from victorlin/docker-network-mode
...
Docker network mode
2014-06-23 11:38:08 -06:00
Nicolas Limage
78b6550f9b
fixes potential ext_pillar line mismatches
2014-06-23 18:26:53 +02:00
Joseph Hall
25c11744d8
Merge pull request #13647 from lkoenigsberger/develop
...
Update msazure.py
2014-06-23 06:21:04 -06:00
lkoenigsberger
317eef5fa0
Update msazure.py
...
Added new Sizes (A8, A9) for virtual machines.
2014-06-23 08:49:49 +02:00
Thomas S Hatch
d8efa82b15
initial commit for minion swarm to work with raet
...
This skips the single keygen that zeromq transport uses because
1. Key gen is not exposed to salt-key yet for raet
2. raet keys are super fast, so I don't think this will be an issue,
but testing on a grander scale will tell us for sure
2014-06-22 22:40:40 -06:00
Erik Johnson
c5cb5010fc
Add example of using py renderer for file.managed
2014-06-22 21:42:39 -05:00
Pedro Algarvio
93c5e0ece2
Merge pull request #13644 from s0undt3ch/hotfix/setup-raet
...
Also include the cloud requirements file
2014-06-23 01:17:18 +01:00
Pedro Algarvio
9e76bb4ec3
Also include the cloud requirements file
2014-06-23 01:16:23 +01:00
Joseph Hall
b9fc168f60
Merge pull request #13643 from s0undt3ch/develop
...
Reorder imports and don't even run setUp is expensive tests are not enabled
2014-06-22 18:09:31 -06:00
Pedro Algarvio
de4892b7ee
Reorder imports and don't even run setUp is expensive tests are not enabled
2014-06-23 01:00:42 +01:00
Pedro Algarvio
a283d52df1
Reorder imports and don't even run setUp is expensive tests are not enabled
2014-06-23 01:00:04 +01:00
Pedro Algarvio
99a8e05aa9
Reorder imports and don't even run setUp is expensive tests are not enabled
2014-06-23 00:59:27 +01:00
Pedro Algarvio
992cdc07b1
Reorder imports and don't even run setUp is expensive tests are not enabled
2014-06-23 00:58:39 +01:00
Joseph Hall
e156ca2bc7
Merge pull request #13642 from s0undt3ch/hotfix/cloud-relative-to-absolute-paths
...
Convert cloud related relative paths to absolute paths(if they exist)
2014-06-22 17:33:22 -06:00
Thomas S Hatch
de9451eaa1
Merge pull request #13625 from s0undt3ch/hotfix/setup-raet
...
ZeroMQ dependencies should be pulled by default
2014-06-22 17:31:27 -06:00
Pedro Algarvio
910ea9ca6d
Convert cloud related relative paths to absolute paths(if they exist)
...
The cloud configuration file can point to a relative master file:
```
master_config: another/dir
```
We just convert those into `<cloud-config-dir>/another/dir` if the path
exists.
This also works for `providers_config` and `profiles_config`
2014-06-23 00:16:08 +01:00
Erik Johnson
6e4ac89be0
Clarify that templates are used on managed files
2014-06-22 16:16:49 -05:00
Pedro Algarvio
8747261f47
Merge pull request #13639 from mguegan/patch-1
...
Add a method context environment PATH
2014-06-22 12:57:36 +01:00
Pedro Algarvio
4778ff1b05
Merge pull request #13638 from makinacorpus/f3
...
buildout: fix bootstrap file perms
2014-06-22 12:57:05 +01:00
Mathieu Le Marec - Pasquet
22bb499d43
review for cmdmod fix
2014-06-22 13:46:36 +02:00
Pedro Algarvio
74f4bf96d3
Merge pull request #13637 from makinacorpus/f2
...
cmd: Forward the working dir to VT
2014-06-22 11:42:09 +01:00
Matthieu Guegan
49419f94c3
Add a method context environment PATH
...
Some modules are referring to PATH env variable which do not contains /opt/local/.. paths by default. This fix provides correct PATH handling
2014-06-22 11:38:35 +02:00
Mathieu Le Marec - Pasquet
ad692588f3
VT support for buildout mods
2014-06-22 11:35:50 +02:00
Mathieu Le Marec - Pasquet
2e153844e8
buildout: fix bootstrap file perms
2014-06-22 11:35:33 +02:00
Mathieu Le Marec - Pasquet
823076a824
cmd: Forward the working dir to VT
2014-06-22 11:35:04 +02:00
Erik Johnson
cbb50f58bf
Merge pull request #13633 from zeezooz/fix_grains.append
...
Allow to append if the grain doesn't exist.
2014-06-21 19:52:15 -05:00
Victor Lin
962fb0c211
Fix syntax error
2014-06-21 15:30:24 -07:00
