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

56917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
f6481a1fb3 Merge pull request #26410 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-18 11:52:13 -06:00
Erik Johnson
5d969116ad Merge pull request #26427 from alprs/fix-git_latest_no_rev_concat 
git.latest with no rev: fix concatenation error (NoneType and str)
 2015-08-18 12:27:49 -05:00
TheBigBear
e57dc520f6 minor edits 
lowercasing firefox as it's sls pkg name has been lowercased,
and fix one typo reops -> repos
 2015-08-18 18:11:44 +01:00
Colton Myers
38f22875e1 Fix schedule test failures 
Includes removal of heavily-mocked test_list and test_reload
 2015-08-18 10:48:01 -06:00
C. R. Oldham
1e6e4f0256 Only default proxy minion options that really have to change. 2015-08-18 10:31:26 -06:00
Mike Place
0f64be710f Merge pull request #26430 from rallytime/fix-26426 
List public and private ips under the correct label
 2015-08-18 10:20:32 -06:00
Pedro Algarvio
06dcaefcaa Fix missed typo 2015-08-18 17:18:59 +01:00
C. R. Oldham
6596b72219 Add proxy-specific default configuration and change default for proxy config file & logs to /etc/salt/proxy and /var/log/salt/proxy. 2015-08-18 10:16:54 -06:00
Mike Place
4d6ebc6954 Merge pull request #26307 from cachedout/fix_26234 
Fix bug in top file ordering
 2015-08-18 10:02:54 -06:00
Jorge Schrauwen
53de0b49d1 fix possible shell injection 2015-08-18 15:49:03 +00:00
Nicole Thomas
913451a414 Merge pull request #26431 from rallytime/bp-26417 
Back-port #26417 to 2015.5
 2015-08-18 09:41:58 -06:00
Nicole Thomas
96b8c1fe82 Merge pull request #26428 from cro/pm_20158_2 
Update docs to reflect new pillar structure
 2015-08-18 09:32:23 -06:00
scottjpack
0254a2e90e Changed t1 -> t2 micro 
t1.micro no longer supports HVM AMIs.  Attempted launch with a t1.micro results in:

[ERROR   ] AWS Response Status Code and Error: [400 400 Client Error: Bad Request] {'Errors': {'Error': {'Message': "Non-Windows instances with a virtualization type of 'hvm' are currently not supported for this instance type.", 'Code': 'InvalidParameterCombination'}}, 'RequestID': 'd8d20595-0a17-42ad-9f9a-41cbd009098d'}
 2015-08-18 09:22:57 -06:00
rallytime
2ba97316c9 List public and private ips under the correct label 
Fixes #26426
 2015-08-18 09:19:26 -06:00
Mike Place
983619f1f6 Merge pull request #26429 from cachedout/tcp_freebsd_warn 
Add release note regarding tcp transport on freebsd
 2015-08-18 09:06:47 -06:00
Mike Place
fa88b7d35c Add release note regarding tcp transport on freebsd 
Refs #26364
 2015-08-18 09:06:13 -06:00
C. R. Oldham
b5a4a53062 Update documentation to reflect new pillar structure. 2015-08-18 09:03:23 -06:00
Mike Place
53d4739fa3 Merge pull request #26418 from driskell/fix_discarded_events_2015.8 
Fix forward-merged caching from 2015.5 into 2015.8 to be compatible with the new match_func
 2015-08-18 08:59:16 -06:00
Mike Place
9fa82ba0b7 Fix test 2015-08-18 08:51:00 -06:00
Andreas Lutro
a8bb0c40b1 if no rev, set remote_rev to HEAD 2015-08-18 16:48:57 +02:00
Andreas Lutro
2f55d60293 git.latest: add test for no rev 
technically, rename existing test and add a new simpler test with the
old name.
 2015-08-18 16:38:24 +02:00
Andreas Lutro
5fa86fee0a set remote_rev to None earlier if rev is None 
this prevents errors later on when trying to concatenate rev with a
string. cannot concatenate NoneType and str
 2015-08-18 16:33:15 +02:00
Mike Place
284e1b9342 Merge pull request #26252 from DSRCompany/issues/24048_http_client_2015.8 
Issues/24048 http client 2015.8
 2015-08-18 08:19:45 -06:00
Mike Place
a3b32bbc9e Merge pull request #26413 from evverx/fix-start-restart-reload-and-force-reload 
Fix service.{start,restart,reload,force-reload} for masked services
 2015-08-18 08:16:15 -06:00
Mike Place
e5309df170 Merge pull request #26393 from dmurphy18/dgm_envfix 
Added option parameters to make_repo to allow for configuration settings
 2015-08-18 08:14:57 -06:00
Mike Place
afec85caff Merge pull request #26422 from TheBigBear/patch-9 
no dots in SLS filename __AND__ any directories (incl git repos)
 2015-08-18 08:09:15 -06:00
Mike Place
aae52d901d Merge pull request #26323 from 0xf10e/fix_glance_mod_cred 
Fix Credentials used in `glance` Exec Module
 2015-08-18 08:03:37 -06:00
Mike Place
55cd5f5ab6 Merge pull request #26341 from terminalmage/git-refactor 
Rewrite git state and execution modules
 2015-08-18 08:02:28 -06:00
Mike Place
952da7abaf Merge pull request #26378 from stanislavb/2015.5 
Fix EC2 credentials from IAM roles for s3fs and s3 ext_pillar in 2015.5
 2015-08-18 08:01:53 -06:00
Mike Place
871933076b Merge pull request #26419 from terminalmage/issue26245 
Only use pygit2.errors if it exists
 2015-08-18 08:00:36 -06:00
Mike Place
09e96dce39 Merge pull request #26420 from terminalmage/issue26245-2015.5 
Only use pygit2.errors if it exists (2015.5 branch)
 2015-08-18 08:00:01 -06:00
Mike Place
ba56111e9b Merge pull request #26423 from eliasp/patch-1 
doc - Correct function name for peer configuration
 2015-08-18 07:59:41 -06:00
Jason Woods
63b195987e Fix forward-merged caching from 2015.5 into 2015.8 to be compatible with the new match_func 2015-08-18 14:37:23 +01:00
Elias Probst
7be153119b doc - Correct function name for peer configuration 
The current doc text referenced a state module function, not an execution module function.
Correct this and make it consistent with the YAML example below.
 2015-08-18 14:13:21 +02:00
TheBigBear
b5e73f033d no dots in SLS filename __AND__ any directories (incl git repos) 
also see https://github.com/saltstack/salt/issues/26264 and https://github.com/saltstack/salt/issues/26158
 2015-08-18 12:31:49 +01:00
Dmitry Kuzmenko
4a6e7a592a Use default values if not in opts 2015-08-18 13:46:27 +03:00
Erik Johnson
b7447fcadb Fix git.clone tests to reflect new return data 2015-08-18 03:39:27 -05:00
Erik Johnson
19a1149067 Only use pygit2.errors if it exists (2015.5 branch) 
pygit2 0.20.3 is the only supported pygit2 for gitfs which doesn't have
this errors submodule. We need to account for it not being there.

Fixes #26245 for the 2015.5 branch
 2015-08-18 03:29:52 -05:00
Erik Johnson
e2efa1472d Only use pygit2.errors if it exists 
pygit2 0.20.3 is the only supported pygit2 for gitfs which doesn't have
this errors submodule. We need to account for it not being there.

Fixes #26245 for 2015.8 branch and forward.
 2015-08-18 03:25:45 -05:00
Erik Johnson
70f5b9f03e Change return data from git.clone 
The behavior is too different between different versions of git.
Older versions send status updates to stdout only, newer versions send
some data to stdout, some to stderr. For consistency's sake, just return
a boolean for this function.
 2015-08-18 02:56:35 -05:00
Erik Johnson
8dc8eb4b41 Fix test_add_dir 
Paths in the expected output needed to be relative, not full
 2015-08-18 02:40:25 -05:00
Erik Johnson
7c9f2027f6 Remove usage of os.chdir except in setUp 
Additionally, take measures to ensure that we chdir back to the original
cwd at the conclusion of the test.

A redundant test has also been removed, was likely a stray copypasta.
 2015-08-18 02:15:21 -05:00
Stanislav Blokhin
39ce3127cd Let utils.aws query instance metadata 
s3fs fileserver and s3 pillar backend both use utils.aws to query
Amazon S3 API. This change avoids setting hard-coded fallback values
and rather forwards None values of key and keyid so that
utils.aws can make the fallback decision.

Fallback features:

* pillar.s3.ext_pillar() allows key and keyid to be empty
* utils.s3.query() does not use utils.iam anymore to retrieve
credentials from EC2 instance meta-data
* utils.s3.query() falls back on setting empty key & keyid to magical
value from utils.aws.IROLE_CODE to let utils.aws.sig4() fill in
credentials from EC2 meta-data.

utils.aws features:

X-Amz-Security-Token header, which is necessary when using temporary
credentials from IAM roles, now properly signed.
 2015-08-18 08:58:16 +02:00
Erik Johnson
dd9bcc896e Lint fixes 2015-08-17 22:10:39 -05:00
Erik Johnson
88aca43eda Fix mismatched verb tense in test=True comments 2015-08-17 22:10:39 -05:00
Erik Johnson
cc8a5b181e Remove unit tests for git states 
These need to be completely rewritten
 2015-08-17 22:10:39 -05:00
Erik Johnson
294aad298e Add proper tests for git execution module 2015-08-17 22:10:39 -05:00
Erik Johnson
520127207a Fixes to git state module made during writing tests 2015-08-17 22:10:39 -05:00
Erik Johnson
8e8e947f99 Fixes to git execution module made during writing tests 2015-08-17 22:10:38 -05:00
Erik Johnson
cfe87b7167 Fixes for git.checkout, git.clone found while writing tests 2015-08-17 22:10:38 -05:00