valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
59,678 Commits 24 Branches 182 Tags 341 MiB
d5f438aba9
Commit Graph

59678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
f3da6e4bb3 Merge pull request #27497 from blueyed/dockerng-fix-404-private-forced 
dockerng: fix image_present for forced, non-existent image
 2015-09-29 08:49:46 -05:00
Aaron Bell
a8f359c051 - added logic to check for existing domain 
- added functionality to define/launch new domain based on args
 2015-09-29 09:41:23 -04:00
Daniel Hahler
e3c66cea3a dockerng: fix image_present for forced, non-existent image 
With a non-existent image, which is forced, the call to `inspect_image`
will raise a `CommandExecutionError`: "Unable to get info for image".

This commit changes it to only call `inspect_image` for existing images.
 2015-09-29 14:39:27 +02:00
Daniel Hahler
d8969363c8 Fix version reporting of gitpython 
The module is called `git`, not `gitpython`.

Without this, the version for `gitpython` will not show up with
`salt-call --versions-report`.
 2015-09-29 13:27:48 +02:00
Trần Tuấn Anh
b3d17d10af fix PEP8 2015-09-29 15:30:08 +07:00
EYJ
39f6c530df Add boothook support for cloud_init 2015-09-29 10:04:03 +02:00
Ryan Lane
0d96b16a52 Fix yaml inclusion location 2015-09-28 17:57:44 -07:00
Ryan Lane
6401c6688f Add missing boto_asg changes 2015-09-28 17:56:53 -07:00
Ryan Lane
5e25454fc1 Followups for using __states__ 2015-09-28 16:36:28 -07:00
Ryan Lane
4cdf9e2824 Fixes for __states__ calls 2015-09-28 16:31:51 -07:00
Mike Place
284984e6ba Merge pull request #27411 from terminalmage/issue27205 
Fix invocation of git.config_get and git.config_set
 2015-09-28 16:53:01 -06:00
Erik Johnson
cbcb5475b6 Merge pull request #27477 from terminalmage/issue27217 
Don't append role to hash_cachedir
 2015-09-28 17:26:34 -05:00
Nicole Thomas
bcc8443442 Merge pull request #27470 from cachedout/doc_fixup 
Minor doc fixup.
 2015-09-28 15:51:12 -06:00
Nicole Thomas
2f71833260 Merge pull request #27474 from whiteinge/docs-pymongo-fix 
Add fake pymongo version attribute for the docs
 2015-09-28 15:49:25 -06:00
Ryan Lane
603c9ede49 Add scheduled actions (like scaleup/scaledown actions) to boto_asg 2015-09-28 14:46:42 -07:00
Nicolas Delaby
b184faa55b Enforce usage of host_config and require docker-py>=1.4.0 2015-09-28 23:24:57 +02:00
Nasenbaer
c185e99970 Second attempt to fix #27217 2015-09-28 15:46:46 -05:00
Ryan Lane
a01f8ac62c Use __states__ for calls to other boto states 2015-09-28 13:44:08 -07:00
Mike Place
9202f956f3 Merge pull request #27466 from blueyed/fix-gnupg-version 
Fix version reporting of python-gnupg and mysql-python
 2015-09-28 14:25:00 -06:00
Erik Johnson
fa70ef2e31 salt.utils.gitfs: Don't use close_fds=True on Windows 
Fixes #27220.
 2015-09-28 14:52:08 -05:00
Seth House
64b54e668a Add fake pymongo version attribute for the docs 
This bypasses the following traceback when building the docs.

File "/Users/shouse/src/salt/salt/salt/returners/mongo_future_return.py", line 72, in <module>
    version = '.'.join(version.split('.')[:2])
TypeError: 'Mock' object has no attribute '__getitem__'
 2015-09-28 13:51:31 -06:00
Mike Place
6d8e9af297 Merge pull request #27465 from ticosax/fix-dockerng-cmd 
Fix usage of dockerng "cmd" was #27459
 2015-09-28 13:27:41 -06:00
Mike Place
aefe6d794a Merge pull request #27417 from whiteinge/bp-25243 
Backport #25243 into 2015.8
 2015-09-28 13:15:53 -06:00
Mike Place
a49cdab950 Minor doc fixup. 
Language and grammar changes.
 2015-09-28 13:11:58 -06:00
Mike Place
16bc81e7b9 Merge pull request #27434 from netroby/pr/salt-ssh-copy-id 
Doc: copy key to server via ssh-copy-id
 2015-09-28 13:08:55 -06:00
Mike Place
c7a4ed0066 Merge pull request #27333 from DSRCompany/feature/23157_module_executor 
Updated executors and fixed some issues
 2015-09-28 13:04:51 -06:00
Mike Place
7d0512406b Merge pull request #27464 from cachedout/lint_27365 
Lint 27365
 2015-09-28 12:38:26 -06:00
Mike Place
f60f26da67 Merge pull request #27387 from adelcast/dev/adelcast/add_grains_refresh_networksettings_beacon 
network_settings beacon: add grains refresh if network change is detected
 2015-09-28 12:35:57 -06:00
Daniel Hahler
9c1454fe59 Fix version reporting of mysql-python 
The module is called `MySQLdb`, not `mysql-python`.

Without this, the version for `mysql-python` will not show up with
`salt-call --versions-report`.
 2015-09-28 20:13:08 +02:00
Daniel Hahler
437fb4407e Fix version reporting of python-gnupg 
The module is called `gnupg`, not `python-gnupg`.

Without this, the version for `python-gnupg` will not show up with
`salt-call --versions-report`.
 2015-09-28 20:05:21 +02:00
Nicolas Delaby
a1ed6cda56 Skip test if docker-py is not installed 2015-09-28 19:53:10 +02:00
Mike Place
74095b6b22 Lint 2015-09-28 11:48:51 -06:00
Mike Place
7dcec62fcc Merge pull request #27441 from Deewiant/issue-27401 
states.file: allow prepending to non-existent file (#27401)
 2015-09-28 11:40:31 -06:00
Mike Place
a07411a4d9 Merge pull request #27423 from dmurphy18/dgm_envfix 
Changes to support configurable repository for Debian / Ubuntu
 2015-09-28 11:34:22 -06:00
Mike Place
7367a4e32b Only clean context if it exists 
Prevents an attribute error
 2015-09-28 09:44:27 -06:00
Erik Johnson
6f7769aa94 Correct log messages/docstrings 2015-09-28 10:09:09 -05:00
Nicolas Delaby
cc8471bd1b dockerpy expect only command argument not cmd 2015-09-28 10:08:40 -05:00
Mike Place
d4d96bb3fc Merge pull request #27428 from rallytime/bp-27398 
Back-port #27398 to 2015.8
 2015-09-28 09:03:16 -06:00
Mike Place
668c69bd7e Merge pull request #27429 from rallytime/bp-27344 
Back-port #27344 to 2015.8
 2015-09-28 09:01:20 -06:00
Mike Place
f1f5cc653b Merge pull request #27431 from jagguli/develop 
Check Names kwarg is not None
 2015-09-28 08:51:48 -06:00
Mike Place
1961dd2726 Merge pull request #27449 from JaseFace/fix-27391-for-develop 
Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item()
 2015-09-28 08:51:08 -06:00
Mike Place
c639931340 Merge pull request #27450 from ticosax/fix-typo 
[dockerng] Fix typo in docstring
 2015-09-28 08:27:35 -06:00
EYJ
9f379e1e0c Add the state function boto_ec2.snapshot_created 2015-09-28 13:13:53 +02:00
Sergei Iakhnin
c501e893f5 Ensure git submodules are initialized when the submodules option is set to true 
The git.latest state does not initialize submodules when the submodules:True option is specified. Hence, no submodules are fetched.

Steps to reproduce: git.latest any repo with submodules
Fix: add the --init flag to the "git submodule update" call
 2015-09-28 11:07:29 +02:00
Nicolas Delaby
9cea62de67 Fix typo in docstring 2015-09-28 09:24:15 +02:00
Jason Wolfe
7522954160 Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item() 
Prior to this, when schedule.present compares the existing schedule to the one crafted by this function, enabled will actually be removed at each run.  schedule.present sees a modification needs to be made, and invokes schedule.modify, which does so with enabled: True, creating and endless loop of an 'enabled' removal and addition.
 2015-09-27 12:26:37 -07:00
Matti Niemenmaa
8eb5036f1f states.file: allow prepending to non-existent file (#27401) 
Remove the redundant file.touch invocation also from file.append, to
simplify the flow.
 2015-09-27 09:06:51 +03:00
ZhiFeng Hu
58ea4550ba Doc: copy key to server via ssh-copy-id 
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
 2015-09-26 22:55:00 +08:00
Joseph Hall
333c305ba0 Merge pull request #27430 from jacksontj/2015.8 
Fix bug introduced in eee0291ff8
 2015-09-25 19:09:40 -06:00
Steven Joseph
3a234158ad Check Names kwarg is not None 2015-09-26 10:18:27 +10:00