valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,170 Commits 24 Branches 182 Tags 341 MiB
bba9990662
Commit Graph

85170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandru Bleotu
bba9990662 Added pass_to_ext_pillars to valid config options 2017-08-25 06:41:20 -04:00
Alexandru Bleotu
f7c5b2f046 Added argspec check to see if external pillar functions support the extra_minion_data parameter 2017-08-25 06:41:06 -04:00
Alexandru Bleotu
bcd1c78fbb Passed extra minion data (if with content) to external pillar functions 2017-08-25 06:39:13 -04:00
Alexandru Bleotu
2ea93f4a81 Added the extra_minion_data param when instantiating the pillar object 2017-08-25 06:05:31 -04:00
Alexandru Bleotu
3dbd5b5eaa Inherited RemotePillarMixin and added sending the extra minion data when requesting the pillar 2017-08-25 06:03:25 -04:00
Alexandru Bleotu
fbbb36fe04 Added RemotePillarMixin containing remote pillar common functionality 
- retrieve the config data to be sent to external pillar functions
 2017-08-25 06:03:23 -04:00
Mike Place
3d5a630c59 Merge pull request #43161 from bodhi-space/infra5461 
INFRA-5461 - fix a couple of smallish bugs in boto_elb exec and state modules
 2017-08-24 17:06:45 -06:00
Mike Place
949f83a05d Merge pull request #43177 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-24 17:04:07 -06:00
Nicole Thomas
ad7b66ec53 Merge pull request #43169 from terminalmage/issue15071 
Improve pkgrepo docs
 2017-08-24 16:11:35 -04:00
rallytime
3d0d9110ac Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/pillar/git_pillar.py
  - salt/utils/files.py
  - salt/utils/process.py
  - tests/unit/utils/test_which.py
 2017-08-24 15:33:15 -04:00
garethgreenaway
034c325a09 Merge pull request #43168 from rallytime/bp-43041 
Back-port #43041 to 2017.7
 2017-08-24 12:07:22 -07:00
garethgreenaway
d48938e6b4 Merge pull request #43172 from rallytime/move-utils-funcs 
Move new utils/__init__.py funcs to utils.files.py
 2017-08-24 12:05:29 -07:00
Tom Williams
9d97ea30e7 INFRA-5461 - add time constraint to loop 2017-08-24 13:17:27 -04:00
Erik Johnson
e60f586442 Merge pull request #43061 from pabloh007/fix-save-image-name-id 
Have docker.save use the image name when valid if not use image id, i…
 2017-08-24 11:32:01 -05:00
Nicole Thomas
4d174746f9 Merge pull request #43049 from redmatter/add-docker-network-ipam-support 
Add docker network ipam support
 2017-08-24 12:19:16 -04:00
rallytime
5385c7901e Move new utils/__init__.py funcs to utils.files.py 
We're in the process of breaking up the utils/__init__.py file, so
let's steer clear of adding new funcs here.

This way we can avoid a deprecation process for these functions in
develop, since the funcs in this location were never released.

Refs #43056
 2017-08-24 12:07:44 -04:00
Erik Johnson
999aa63d3d Improve pkgrepo docs 
Also deprecate the refresh_db argument in aptpkg.mod_repo (and the
pkgrepo states), in favor of the widely used "refresh" argument.
 2017-08-24 10:54:53 -05:00
Darren Demicoli
d010b74b87 Do not try to match pillarenv with __env__ 2017-08-24 11:53:34 -04:00
Erik Johnson
04f9297213 Merge pull request #42823 from rallytime/remove-legacy-git-pillar 
Remove deprecated Legacy Git Pillar code
 2017-08-24 10:29:26 -05:00
Mike Place
9da57543f8 Merge pull request #43166 from lomeroe/bp-43116-2017.7 
Backport #43116 to 2017.7
 2017-08-24 09:01:23 -06:00
Andy Bulford
89ac3f9092 Merge branch 'develop' into add-docker-network-ipam-support 2017-08-23 23:02:07 +01:00
Nicole Thomas
a7a323afc2 Merge pull request #42832 from ubaumann/pillar_show_low_sls 
Add custom pillar value support
 2017-08-23 17:42:01 -04:00
Tom Williams
18b8fc8cad INFRA-5461 - fix a couple of smallish bugs in boto_elb modules 2017-08-23 17:13:13 -04:00
rallytime
c48801095f Remove tests for old git_pillar syntax. 
These tests were testing things present in the legacy git pillar syntax
and are no longer needed. The new git pillar syntax has many more integration
tests to cover various cases.
 2017-08-23 16:49:58 -04:00
rallytime
83f87077ba Remove unused import 2017-08-23 16:49:58 -04:00
rallytime
5901b10c14 Remove deprecated Legacy Git Pillar code 2017-08-23 16:49:58 -04:00
ubaumann
0c760afd5a Merge branch 'develop' into pillar_show_low_sls 2017-08-23 21:20:54 +02:00
Mike Place
2d05aa0db1 Merge pull request #43041 from darcoli/develop 
Do not try to match pillarenv with __env__
 2017-08-23 12:37:23 -06:00
Mike Place
0f4d1dd767 Merge pull request #41662 from lordcirth/nfs-exports 
Expand module nfs3
 2017-08-23 12:19:34 -06:00
Mike Place
970003731a Merge pull request #42111 from bechtoldt/fix_ssh_auth_keys_newline 
stripping whitespaces/newlines in authorized key file lines
 2017-08-23 12:12:25 -06:00
Mike Place
ae5d3ffe99 Merge pull request #43013 from amendlik/kernelpkg-remove 
Add kernelpkg functions to remove kernel packages
 2017-08-23 11:47:58 -06:00
Mike Place
44b3caead1 Merge pull request #43056 from damon-atkins/2017.7 
safe_filename_leaf(file_basename) and safe_filepath(file_path_name)
 2017-08-23 11:35:01 -06:00
Mike Place
96509dcc2f Merge pull request #43145 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-23 10:56:40 -06:00
Mike Place
6ca9131a23 Merge pull request #43146 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-23 10:56:09 -06:00
lomeroe
af181b3257 correct fopen calls from salt.utils for 2017.7 2017-08-23 11:11:08 -05:00
Mike Place
03f652159f Merge pull request #43123 from twangboy/win_fix_test_which 
Fix `unit.utils.test_which` for Windows
 2017-08-23 10:01:38 -06:00
Mike Place
3083ac3bea Merge pull request #43129 from vutny/import-master-util-modules 
Import util modules on Master like it works on Minion
 2017-08-23 09:59:02 -06:00
Mike Place
5a4fc07863 Merge pull request #43142 from rallytime/bp-43068 
Back-port #43068 to 2017.7
 2017-08-23 09:56:47 -06:00
rallytime
bcbe180fbc Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-08-23 10:08:09 -04:00
rallytime
0eafc59f33 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/win_groupadd.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/url.py
 2017-08-23 10:07:01 -04:00
Nicole Thomas
b3aa9ab394 Merge pull request #42998 from vernondcole/bugfix/ignore_missing_parent_directory 
Routine fell back to eauth gently if keyfile was missing, but errored…
 2017-08-23 09:36:46 -04:00
Nicole Thomas
0467a0e3bf Merge pull request #43038 from twangboy/win_unit_utils_test_url 
Fix `unit.utils.test_url` for Windows
 2017-08-23 09:35:24 -04:00
Andreas Thienemann
efc1c8c506 Mark selinux._filetype_id_to_string as public function 
_filetype_id_to_string is a private function in the selinux
module.
The selinux state module calls the function as filetype_id_to_string
which fails of course.

Rename the function from the private one to a public one to make
the state call work.

Resolves #42505.
 2017-08-23 09:29:29 -04:00
Nicole Thomas
581503e7c0 Merge pull request #43068 from ixs/develop 
Mark selinux._filetype_id_to_string as public function
 2017-08-23 09:28:05 -04:00
Nicole Thomas
e9ccaa61d2 Merge pull request #43097 from twangboy/win_fix_group 
Fix `group.present` for Windows
 2017-08-23 09:19:55 -04:00
Nicole Thomas
5cb40aca42 Merge pull request #43118 from danielmotaleite/vault-doc 
Add example how to setup vault token via environment variable.
 2017-08-23 09:13:37 -04:00
Nicole Thomas
780609ccc3 Merge pull request #43121 from johnrizzo1/patch-1 
Update boto_iam.py
 2017-08-23 09:11:05 -04:00
Daniel Mota Leite
5e2b367f83 Merge branch 'develop' into vault-doc 2017-08-23 12:10:21 +01:00
Denys Havrysh
330d989b46 Import util modules on Master like it works on Minion 2017-08-23 11:28:02 +03:00
twangboy
ed97cff5f6 Fix unit.utils.test_which for Windows 
This test wasn't really written with Windows in mind. Uses PATHEXT that
actually resembles a Windows environment. The test value has the correct
path seperator for Windows.
 2017-08-22 16:59:22 -06:00