saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
89295 commits 34 branches 292 tags 803 MiB
Commit graph

2472 commits

Author SHA1 Message Date
Erik Johnson
7b13a7df8b
Replace json module usage with a helper to ensure unicode content is handled properly 
This adds wrappers for json.dump{,s} which disable `ensure_ascii` by
default.
 2017-12-27 09:30:58 -06:00
rallytime
9ded5e1cbb
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/config/__init__.py
  - salt/grains/core.py
  - salt/modules/win_lgpo.py
  - salt/returners/mysql.py
  - salt/states/libcloud_dns.py
  - tests/integration/runners/test_runner_returns.py
  - tests/unit/grains/test_core.py
 2017-12-21 15:58:08 -05:00
rallytime
fe81e2d39a
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-12-20 10:26:10 -05:00
Vernon Cole
0bdb46dab9
add clouds modules to index 2017-12-20 06:58:09 -05:00
Mike Place
66ce508a93
Merge pull request #44823 from garethgreenaway/scheduler_tests 
Scheduler tests
 2017-12-12 15:05:25 -07:00
rallytime
9db4179462
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/unit/grains/test_core.py
 2017-12-12 15:24:30 -05:00
Tobias Jungel
de227769d6
document color_theme 
this adds some documentation for the the color_theme added in #3511
 2017-12-12 10:03:23 +01:00
rallytime
08c71f13e4
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/thorium/index.rst
  - salt/beacons/__init__.py
  - salt/client/mixins.py
  - salt/client/ssh/wrapper/state.py
  - salt/daemons/masterapi.py
  - salt/grains/extra.py
  - salt/minion.py
  - salt/modules/cron.py
  - salt/modules/file.py
  - salt/modules/mac_user.py
  - salt/modules/napalm_network.py
  - salt/modules/state.py
  - salt/modules/win_file.py
  - salt/modules/win_pkg.py
  - salt/proxy/dummy.py
  - salt/state.py
  - salt/states/file.py
  - salt/states/lxc.py
  - salt/utils/__init__.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_file.py
  - tests/integration/modules/test_groupadd.py
  - tests/integration/ssh/test_state.py
  - tests/integration/states/test_file.py
  - tests/unit/daemons/test_masterapi.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_disk.py
  - tests/unit/modules/test_napalm_network.py
  - tests/unit/modules/test_state.py
  - tests/unit/test_minion.py
  - tests/unit/utils/test_process.py
 2017-12-11 18:24:41 -05:00
Daniel Wallace
9e5d6c03f8
Merge branch 'develop' into shade 2017-12-11 08:53:13 -07:00
Nicole Thomas
95d9eb5744
Merge pull request #44324 from benediktwerner/accept-minions-from-grains 
Automatically accept minion keys based on grains
 2017-12-08 09:02:01 -05:00
Benedikt Werner
5882a3c779
Fixed line length in docs 2017-12-07 16:31:17 +01:00
Erik Johnson
64aa4fbbec
Many improvements to docker network and container states 
Much Improved Support for Docker Networking
===========================================

The `docker_network.present` state has undergone a full rewrite, which
includes the following improvements:

Full API Support for Network Management
---------------------------------------

The improvements made to input handling in the
`docker_container.running` state for 2017.7.0 have now been expanded to
docker_network.present`.  This brings with it full support for all
tunable configuration arguments.

Custom Subnets
--------------

Custom subnets can now be configured. Both IPv4 and mixed IPv4/IPv6
networks are supported.

Network Configuration in :py:func:`docker_container.running` States
-------------------------------------------------------------------

It is now possible to configure static IPv4/IPv6 addresses, as well as
links and labels.

Improved Handling of Images from Custom Registries
==================================================

Rather than attempting to parse the tag from the passed image name, Salt
will now resolve that tag down to an image ID and use that ID instead.

Due to this change, there are some backward-incompatible changes to
image management. See below for a full list of these changes.

Backward-incompatible Changes to Docker Image Management
--------------------------------------------------------

Passing image names to the following functions must now be done using separate
`repository` and `tag` arguments:

- `docker.build`
- `docker.commit`
- `docker.import`
- `docker.load`
- `docker.tag`
- `docker.sls_build`

Additionally, the `tag` argument must now be explicitly passed to the
`docker_image.present` state, unless the image is being pulled from a
docker registry.
 2017-12-06 12:12:25 -06:00
Mircea Ulinic
c843914045
Merge branch 'develop' into source-ip-port-opts 2017-12-06 14:46:44 +00:00
Daniel Wallace
9c604d7328
add docs for openstack driver 2017-12-05 16:09:31 -07:00
Daniel Wallace
f7d182871e
remove openstack driver 2017-12-05 16:09:30 -07:00
Nicole Thomas
48fbfd6e7a
Merge pull request #44814 from sypets/documentation-exec-modules 
documentation: use term 'execution modules' instead of just 'modules'…
 2017-12-05 17:49:18 -05:00
Nicole Thomas
8e2e1f957e
Merge pull request #44772 from terminalmage/issue36275 
Rename environment config option to saltenv, introduce lock_saltenv option
 2017-12-04 16:49:23 -05:00
Nicole Thomas
0697ed0645
Merge branch 'develop' into accept-minions-from-grains 2017-12-04 16:10:32 -05:00
Sybille Peters
9070501118 documentation: use term 'execution modules' instead of just 'modules' for more clarity 
Fixes #44707
 2017-12-04 16:32:16 +01:00
rallytime
239f3511bf
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/reg.py
  - salt/modules/state.py
  - salt/modules/win_pkg.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/utils/__init__.py
  - tests/integration/modules/test_file.py
  - tests/integration/output/test_output.py
  - tests/unit/grains/test_core.py
 2017-12-01 11:12:44 -05:00
Nicole Thomas
3c0088b644
Merge branch 'develop' into source-ip-port-opts 2017-12-01 09:38:06 -05:00
Nicole Thomas
5c737100c4
Merge pull request #44726 from terminalmage/issue42188 
Add __context__ to RunnerClient and WheelClient
 2017-11-30 19:03:02 -05:00
Erik Johnson
bf8384d230
Add documentation for lock_saltenv 
Also add documentation for renaming of environment to saltenv
 2017-11-30 14:53:01 -06:00
chris ruscio
e2682bf441 Fix minion ping_interval documentation 2017-11-30 13:56:10 -05:00
Thomas S Hatch
52ab561c4c Add some extra docs 2017-11-30 11:40:40 -07:00
Erik Johnson
0e37ad39c3
Add retcode documentation to orchestrate docs 2017-11-29 10:20:22 -06:00
Gareth J. Greenaway
998d714ee7
Merge pull request #44517 from whytewolf/publish_port_doc_missing 
Publish port doc missing
 2017-11-28 13:50:18 -08:00
rallytime
052b13c98e
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cli/daemons.py
  - salt/client/ssh/__init__.py
  - salt/modules/win_pkg.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/proxy/fx2.py
  - salt/utils/__init__.py
  - salt/utils/jinja.py
  - salt/utils/napalm.py
  - salt/utils/path.py
  - salt/utils/verify.py
  - tests/integration/modules/test_saltutil.py
  - tests/integration/states/test_service.py
  - tests/unit/utils/test_verify.py
 2017-11-22 12:36:03 -05:00
Mircea Ulinic
f091ab28d1
Consitent doc, please! 2017-11-22 14:31:33 +00:00
Mircea Ulinic
c48db41cc4
Specify the right versions for pyzmq and libzmq 2017-11-22 14:30:08 +00:00
Mircea Ulinic
db1e2b5bc6
Add versionadded notes 2017-11-22 12:38:21 +00:00
Mircea Ulinic
5e2d83264c
Document the new opts 2017-11-22 12:05:30 +00:00
rallytime
90d1cb221d
Add documentation about logging before modules are loaded 2017-11-20 09:05:49 -05:00
Roald Nefs
47147e2769
Added new Telegram module 
Added a new Telegram module, which allows to send a message via Telegram
using the Telegram Bot API. The commit also includes:
- Update for the Telegram returner (merged in #44148); the Telegram
returner now fully utilizes the Telegram module.
- Update to the documentation in order to add the Telegram module to the
list list of all modules.
- Updated Telegram returner test.
- New Telegram module test.
 2017-11-20 08:47:57 +01:00
Benedikt Werner
6900e6ece1
Merge branch 'develop' into accept-minions-from-grains 2017-11-17 19:35:53 +01:00
Daniel Wallace
5a8ba39dd7
Merge pull request #44052 from tylerjones4508/docker_util 
Docker util
 2017-11-15 08:51:11 -07:00
Tyler Jones
3d77e27830
Merge branch 'develop' into docker_util 2017-11-14 18:25:33 -05:00
Nicole Thomas
4315c20195
Merge branch 'develop' into add-mandrill-mod 2017-11-14 17:29:52 -05:00
Nicole Thomas
2c6f8f5f9e
Merge pull request #44510 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-11-14 17:21:13 -05:00
Tyler Jones
b97bb46666
Merge branch 'develop' into docker_util 2017-11-14 13:08:36 -05:00
Mircea Ulinic
88c7992bc8
Doc ref the new mandrill exec mod 2017-11-14 11:24:54 +00:00
Tyler Jones
9af65b6af2
fixing virtualname, and other small fixes 2017-11-14 01:35:16 +00:00
Tyler Jones
ae2bbd4d96
Fixing docs,versionadded,formating, and adding the salt.modules.swarm.rst file 2017-11-14 00:08:52 +00:00
Erik Johnson
df972db3ba
Merge pull request #42930 from CorvinM/issue36942 
Jinja line statements and comments
 2017-11-13 12:02:16 -08:00
Thomas Phipps
4b5855283a
missed one place where i didnt chanbge master_port from my copy to publish_port 2017-11-13 12:21:34 -07:00
Nicole Thomas
93c54d9884
Merge pull request #44414 from garethgreenaway/req_any 
[develop] Adding additional requisites to state compiler
 2017-11-13 14:17:09 -05:00
Thomas Phipps
e4610baea5
update doc to have publish port 2017-11-13 12:14:13 -07:00
Mike Place
dd2844a645
Merge pull request #44196 from benediktwerner/develop 
Fix autosign file permission check [develop]
 2017-11-13 11:34:37 -07:00
Mike Place
f2aa3539ef
Merge branch 'develop' into accept-minions-from-grains 2017-11-13 11:13:50 -07:00
rallytime
4e2280157a
Merge branch '2017.7' into 'develop' 
Conflicts:
  - .kitchen.yml
  - tests/unit/test_doc.py
  - tests/unit/utils/test_cloud.py
 2017-11-13 12:27:59 -05:00