valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
87,919 Commits 24 Branches 182 Tags 341 MiB
717dd8e549
Commit Graph

4885 Commits

Author SHA1 Message Date
Nicole Thomas
18dfc1967d Merge pull request #43849 from kkoch986/develop 
Add support for tagging newly created DigitalOcean droplets.
 2017-10-12 11:35:29 -04:00
Nicole Thomas
a85837d72b Merge pull request #44066 from Ch3LL/cherry_release 
Add Known CherryPy Issue to 2017.7.2 Release Notes
 2017-10-12 11:18:24 -04:00
Ch3LL
8e597fcce9
Add Known CherryPy Issue to 2017.7.2 Release Notes 2017-10-12 09:33:59 -04:00
Markus Wyrsch
911ee5f361
Add option to eagerly scrub the disk 2017-10-12 13:43:27 +02:00
Ken Koch
ecda3277d3 Merge branch 'develop' of github.com:kkoch986/salt into develop 2017-10-11 21:14:36 -04:00
Ken Koch
067d4a5dd2 change tags to list based in config 2017-10-11 21:14:27 -04:00
Mike Place
24b9f21456 Merge pull request #43831 from eradman/vmm_grain 
Detect OpenBSD guest running under VMM(4)
 2017-10-11 17:19:52 -06:00
Daniel Wallace
41c086faf7
convert jinja context to dictionary 
For `show_full_context`, it is useful to have this as a serializable dictionary so that it can be dumped and actually parsed using

`{{show_full_context|yaml(False)}}`
 2017-10-11 10:24:34 -06:00
Vernon Cole
e9c7c69402
documentation for vagrant cloud & state 2017-10-11 05:02:26 -06:00
Vernon Cole
4cdb04b409
documentation for vagrant cloud & state 2017-10-11 04:49:47 -06:00
Erik Johnson
d947ddf176
Move 13 functions from salt.utils to salt.utils.data 
These functions are:

- salt.utils.compare_dicts
- salt.utils.compare_lists
- salt.utils.decode_dict
- salt.utils.decode_list
- salt.utils.exactly_n
- salt.utils.exactly_one
- salt.utils.traverse_dict
- salt.utils.filter_by
- salt.utils.traverse_dict_and_list
- salt.utils.subdict_match
- salt.utils.substr_in_list
- salt.utils.is_dictlist
- salt.utils.repack_dictlist
 2017-10-10 17:42:42 -05:00
rallytime
788ad0609a
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-10-10 16:34:52 -04:00
Nicole Thomas
d61300df20 Merge pull request #44023 from Ch3LL/11.9rn 
Add 2016.11.9 Release Note File
 2017-10-10 16:03:01 -04:00
Ch3LL
027f509368
Add 2017.7.3 Release Note File 2017-10-10 15:33:42 -04:00
Ch3LL
7f9015eb41
Add 2016.11.9 Release Note File 2017-10-10 15:31:19 -04:00
Benedikt Werner
bc53598027
Fixed spelling mistake in salt_bootstrap tutorial 2017-10-10 19:03:07 +02:00
Benedikt Werner
6c30344824
Added missing tutorial docs to the tutorial index 2017-10-10 19:02:35 +02:00
Nicole Thomas
33e0353858 Merge branch 'develop' into vmm_grain 2017-10-10 09:01:33 -04:00
Mike Place
e434c39c4e Merge pull request #43960 from cro/ldap_nopw_bind2 
Require that bindpw be non-empty when auth.ldap.anonymous is False
 2017-10-09 17:09:01 -06:00
garethgreenaway
e9dfda2177 Merge pull request #43991 from Ch3LL/3.8_sec_2 
Add Security Notes to 2016.3.8 Release Notes
 2017-10-09 15:00:24 -07:00
Ch3LL
1977df8462
Add Security Notes to 2016.3.8 Release Notes 2017-10-09 16:26:13 -04:00
Ch3LL
57fd6f7bcb
Add Security Notes to 2017.7.2 Release Notes 2017-10-09 13:09:58 -04:00
Ch3LL
f0c3184288
Add Security Notes to 2016.11.8 Release Notes 2017-10-09 13:03:23 -04:00
C. R. Oldham
962a20cf4b
Require that bindpw be non-empty if auth.ldap.anonymous=False 2017-10-06 15:41:07 -06:00
C. R. Oldham
9df3d91d8f
Release notes blurb for change to bindpw requirements 2017-10-06 15:33:10 -06:00
Nicole Thomas
7785919437 Merge pull request #43829 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-10-05 16:09:23 -04:00
Nicole Thomas
f880ac4c08 Merge pull request #43916 from dereckson/fix-typo-cloud-scaleway 
Fix typo in salt-cloud scaleway documentation
 2017-10-05 14:57:59 -04:00
Sébastien Santoro
15b8b8a9f4
Fix typo in salt-cloud scaleway documentation 
s/scalewa/scaleway
 2017-10-04 23:23:00 +00:00
Eric Radman
1a9f12fd67
Detect OpenBSD guest running under VMM(4) 
grains.manufacturer is 'OpenBSD' when running under VMM
 2017-10-02 17:45:37 -04:00
rallytime
2337904656
Add updated release notes to 2017.7.2 branch 2017-10-02 17:18:30 -04:00
Nicole Thomas
9f25a1c2dd Merge pull request #43503 from The-Loeki/high-out-by_id 
Additional highstate output modes; changes_id, filter_id, terse_id, full_id
 2017-10-01 10:14:26 -04:00
Ken Koch
c208f0ac39 Merge branch 'develop' into develop 2017-10-01 08:17:43 -04:00
Ken Koch
57a624d86b Add support for tagging newly created DigitalOcean droplets. 
Signed-off-by: Ken Koch <kkoch986@gmail.com>
 2017-10-01 07:53:07 -04:00
rallytime
a38ceab7cf
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cli/batch.py
  - salt/master.py
  - salt/utils/path.py
  - tests/unit/modules/test_state.py
 2017-09-29 11:48:33 -04:00
garethgreenaway
61280cc0c3 Merge branch 'develop' into release-note-formatting 2017-09-28 19:49:12 -07:00
Nicole Thomas
3f77571dad Merge branch 'develop' into high-out-by_id 2017-09-28 13:27:47 -04:00
Ch3LL
50779c3b1c
Add note to nitrogen release notes about pip for cent6 2017-09-28 11:50:54 -04:00
Simon Dodsley
cdafbe2068
Update Oxygen Release notes with new grains and module 
Also do a final cosmetic fix to the purefa module documentation
 2017-09-28 07:26:30 -07:00
rallytime
d862a6f3f2
Fix some formatting issues on the oxygen release notes page 2017-09-28 09:52:04 -04:00
Mike Place
6a25bf4475 Merge pull request #42349 from coredumb/saltclass 
New pillar/master_tops saltclass module
 2017-09-28 14:26:45 +02:00
rallytime
dfef4a722c
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-27 11:48:39 -04:00
Nicole Thomas
fb86935d99 Merge pull request #43761 from Ch3LL/release_2017.7.2 
Release Notes for 2017.7.2
 2017-09-27 10:34:51 -04:00
Ch3LL
caf5795856
add mac patch notes 2017-09-26 17:27:29 -04:00
Ch3LL
3d5fce0955
Add 2017.7.2 Release Notes 2017-09-26 17:21:24 -04:00
rallytime
120f49f2c4
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/daemons/masterapi.py
  - salt/master.py
  - salt/runners/cache.py
 2017-09-26 16:46:43 -04:00
rallytime
23bb4a5dde
Add GPG Verification section to Contributing Docs 
When we enable GPG Verification for pull request reviews, we should
make sure there is information available in our Contributing docs
about how to sign commits.
 2017-09-26 10:16:56 -04:00
rallytime
babad12d83
Revise "Contributing" docs: merge-forwards/release branches explained! 
Fixes #43650

The merge-forward process needs a more prominent position and explanation
in the contributing documentation. This change attempts to explain this
process a little more fully and incorporates some changes to how we are
handling "main" release branches, "dot" release branches, and "develop"
in a more complete context with merge-forwards.
 2017-09-25 15:23:01 -04:00
Ronald van Zantvoort
a2234e45e2 Update release note docs regarding _id highstate output modes 2017-09-25 18:37:48 +02:00
Ronald van Zantvoort
bfbca748e2 highstate output: Document additional output modes 2017-09-25 18:32:52 +02:00
rallytime
281cbbe048
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cloud/clouds/libvirt.py
  - salt/daemons/masterapi.py
  - salt/modules/file.py
  - salt/modules/yumpkg.py
  - salt/states/archive.py
  - salt/states/file.py
  - salt/utils/files.py
  - salt/utils/minions.py
 2017-09-25 09:40:18 -04:00
rallytime
e0ae50e489
Merge branch '2017.7' into 'develop' 
Conflicts:
  - pkg/salt.bash
  - salt/client/mixins.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/boto_vpc.py
  - salt/modules/win_pkg.py
  - salt/utils/reactor.py
  - tests/unit/utils/test_reactor.py
 2017-09-22 10:24:04 -04:00
rallytime
fca4e5563a
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/unit/utils/test_parsers.py
 2017-09-22 09:40:03 -04:00
Raymond Piller
d91c47c6f0 Salt Repo has Deb 9 and 8 2017-09-21 10:24:41 -04:00
Nicole Thomas
f66eb1c5ad Merge pull request #43588 from gtmanfred/do 
digitalocean should be one word.
 2017-09-21 09:25:38 -04:00
Raymond Piller
5f47ef721c Salt Repo has Deb 9 and 8 2017-09-20 21:41:08 -05:00
Daniel Wallace
afaf76d0ba
add release note 2017-09-19 12:50:50 -06:00
Daniel Wallace
3bae894306
digitalocean should be one word. 
Everything on their webpage is a reference to DigitalOcean
 2017-09-19 12:47:16 -06:00
rallytime
57b9d642c2 Merge branch '2016.11.8' into '2016.11' 
No conflicts.
 2017-09-18 16:40:05 -04:00
Erik Johnson
b5f10696c2 Improve the reactor documentation 
This reorganizes the reactor docs and includes examples of the new
reactor SLS config syntax.
 2017-09-18 16:07:36 -04:00
Mike Place
1a619708c1 Enhance engines docs 
Add a note about formatting to make it more clear.
 2017-09-18 13:44:44 -06:00
Damon Atkins
b3dbafb035 Update doco 2017-09-14 12:28:23 -04:00
Damon Atkins
d4981a2717 Update doco 2017-09-14 12:25:30 -04:00
rallytime
bfcfcd75e8 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
  - salt/minion.py
  - salt/modules/alternatives.py
  - salt/modules/genesis.py
  - tests/unit/modules/test_hosts.py
  - tests/unit/modules/test_ini_manage.py
 2017-09-13 15:15:04 -04:00
Mike Place
9767e46ce4 Merge branch 'develop' into cisc_oxygen_release_notes 2017-09-13 10:45:24 -06:00
Erik Johnson
b85c8510c7 Improve the reactor documentation 
This reorganizes the reactor docs and includes examples of the new
reactor SLS config syntax.
 2017-09-13 10:35:23 -05:00
Mike Place
15ffecd4a7 Give the name of the roster 2017-09-12 15:44:26 -06:00
Mike Place
eba40686e8 Add information about cimc to release notes 2017-09-12 14:39:00 -06:00
Mike Place
27315c31c8 Add release note about ssh rosters 2017-09-12 10:41:06 -06:00
Olivier Mauras
139e065ce9 New pillar/master_tops saltclass module 2017-09-12 15:53:39 +02:00
rallytime
984fa35062 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/key.py
  - salt/modules/mount.py
  - salt/modules/system.py
  - tests/unit/modules/test_mount.py
  - tests/unit/modules/test_pam.py
  - tests/unit/modules/test_parted.py
 2017-09-11 12:55:39 -04:00
rallytime
ef7b4242c3 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-11 12:24:10 -04:00
rallytime
68f529ee5e Add 2016.11.8 release notes 2017-09-11 10:58:16 -04:00
Nicole Thomas
d97a680372 Merge pull request #43333 from damon-atkins/2016.11 
Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed as params + 1 bug
 2017-09-06 10:21:34 -04:00
rallytime
7b07b58396 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/key.py
  - salt/modules/yumpkg.py
 2017-09-06 09:44:34 -04:00
Damon Atkins
92de2bb498 Update doco 2017-09-06 12:31:51 +10:00
Nicole Thomas
f19274e1b4 Merge pull request #43222 from rallytime/oxygen-warnings-env 
Remove deprecation warnings for "env"
 2017-09-05 18:24:54 -04:00
Aneesh Agrawal
ba63920874 Support states returning a list for ret['comment'] 
Some states are complicated and multiple subparts,
or maybe cross-call into __states__ if they manage subresources.
In these cases, they will have multiple comments.
Make this more ergonomic by supporting a list of strings as the
value for ret['comment'] in state returns and documenting this.
By joining comments on newlines, it is possible to combine
single-line and multi-line comments cleanly, as opposed to e.g. commas.

The driving impetus for this is some of the boto modules.
An update to the boto_sqs module is included as an example.

Add a check that outgoing state return data has the right shape,
and add a testcase as well.
Fix the NPM state tests and the saltmod runner & wheel state functions
to comply with the prescribed format.
 2017-09-05 19:52:42 +00:00
Nicole Thomas
a972c4fb8c Merge pull request #42840 from StreetHawkInc/update_azurearm 
Update salt-cloud azurearm to work with latest sdk
 2017-08-30 12:01:34 -04:00
rallytime
0d5a46dbaa Update release branch section with a few more details 2017-08-29 09:38:11 -04:00
rallytime
375b1faa92 Remove deprecation warnings for "env" 
Removal of these deprecation warnings has no behavioral effect, as
support for "env" instead of "saltenv" in these cases has already
been removed. Only the warning text will no longer display to users.
 2017-08-28 10:37:05 -04:00
rallytime
6fad40454a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/utils/napalm.py
 2017-08-28 09:28:41 -04:00
rallytime
d40eba6b37 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/states/git.py
 2017-08-25 16:07:27 -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
Ch3LL
1b24244bd3 Add New Release Branch Strategy to Contribution Docs 2017-08-24 12:51:00 -04:00
rallytime
5901b10c14 Remove deprecated Legacy Git Pillar code 2017-08-23 16:49:58 -04:00
rallytime
bcbe180fbc Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-08-23 10:08:09 -04:00
Denys Havrysh
330d989b46 Import util modules on Master like it works on Minion 2017-08-23 11:28:02 +03:00
Mike Place
449c4c53c3 Add release note for nacl renderer 
Refs #41868
 2017-08-22 13:38:21 -06:00
Nicole Thomas
177a4c366a Merge pull request #42729 from DSRCorporation/features/19732_extended_ext_auth 
Allow `external_auth` limit funs/args for runner/wheel modules.
 2017-08-22 14:19:06 -04:00
Steven
e025b0cc92 Merge branch 'develop' into update_azurearm 2017-08-23 00:22:33 +10:00
Steven Joseph
30bde1d7f3 Updated as per PR comments, 
- add version checking
- add doco
 2017-08-23 00:21:03 +10:00
rallytime
67cdfd28ad Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cli/cp.py
  - salt/modules/testinframod.py
  - salt/states/jenkins.py
  - tests/unit/utils/test_find.py
 2017-08-22 09:07:26 -04:00
Denys Havrysh
af743ff6c3 [DOCS] Add missing utils sub-dir listed for extension_modules 2017-08-22 12:18:42 +03:00
Dmitry Kuzmenko
7ec398eb72 Allow external_auth limit funs/args for runner/wheel modules. 
Example:
external_auth:
  pam:
    thatch:
      - '@runner':
        - 'mod.fun':
          args: ['a', 'b']
          kwargs:
            aa: bb
 2017-08-22 12:17:09 +03:00
rallytime
6ca3607770 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
  - salt/modules/win_pkg.py
  - salt/utils/versions.py
 2017-08-18 09:28:26 -04:00
rallytime
84829a6f8c Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/jenkins.py
  - salt/states/jenkins.py
 2017-08-18 09:13:54 -04:00
Nicole Thomas
c35706fa3f Merge pull request #43011 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-17 16:19:33 -04:00
Nicole Thomas
7960334fb7 Merge pull request #42195 from rares-pop/develop 
minion: add persistent minion_blackout support
 2017-08-17 10:50:41 -04:00
Nicole Thomas
fb8d6594da Merge pull request #41983 from vernondcole/enhancement/saltify_d 
flesh out saltify driver
 2017-08-17 10:26:53 -04:00
rallytime
93c11d827a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
  - salt/minion.py
 2017-08-17 09:30:50 -04:00