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
mvivaldi
62409d608a
Added Escape Filters and Set Theory Filters in jinja documentation
2017-12-09 09:48:55 +01: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
Erik Johnson
b78e373213
Grammar/spelling fixes in release notes
2017-12-06 14:38:35 -06:00
Erik Johnson
457aa8505c
Update release notes for new "docker run" functionality
2017-12-06 12:12:26 -06: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
0568acf2f7
clean up global docs
2017-12-05 16:20:58 -07:00
Daniel Wallace
f7d182871e
remove openstack driver
2017-12-05 16:09:30 -07:00
Nicole Thomas
8569287ecb
Merge pull request #44834 from BadgerOps/bugfix/fix_saltify_docs
...
fixed saltify documentation to refer to 'driver' instead of 'provider…
2017-12-05 16:36:07 -05:00
Nicole Thomas
b946ad3384
Merge pull request #43710 from amendlik/gpg-yaml-sdb
...
Add GPG support to YAML SDB module
2017-12-05 14:42:41 -05:00
BadgerOps
efc86b0eba
fixed saltify documentation to refer to 'driver' instead of 'provider' in provider example
2017-12-05 10:38:53 -07:00
Erik Johnson
ecd0a6a016
Add link to newly-merged docs section
2017-12-05 00:57:14 -06:00
Erik Johnson
abed8e5952
Add documentation / release notes
2017-12-05 00:57:14 -06:00
Adam Mendlik
3252f0655e
Update documentation for __salt__ in SDB modules
2017-12-04 17:41:49 -07: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
Eric Radman
bf9dc026bb
Update salt_boostrap command line help summary
...
- Use exact indentation produced by the bootstrap-salt command
- normal package installs work fine on OpenBSD
2017-12-01 15:28:09 -05: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
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
Mircea Ulinic
f8d69dd0ba
Add thorium_roots configuration example
2017-11-30 12:50:29 +00:00
Mircea Ulinic
4610fb4e62
thorium_roots not thorium_roots_dir
2017-11-30 12:48:17 +00:00
Erik Johnson
0e37ad39c3
Add retcode documentation to orchestrate docs
2017-11-29 10:20:22 -06:00
Erik Johnson
ecdd273231
Add info about runner/wheel retcodes to Oxygen release notes
2017-11-29 09:47:56 -06:00
Nicole Thomas
04b97bcfad
Merge pull request #44663 from whytewolf/ZD1777_ensure_understanding_of_minion_config_over_grains_file
...
Update notes around grains topic, and salt.modules.grains and salt.state.grains
2017-11-27 16:33:37 -05:00
Thomas Phipps
7fb208b5ad
Update note in topics/grains to reflect that not all grains are ignored.
...
only those set in the minion config
also update header of salt.modules.grains to more closely match what
states says in regard to this.
and tweak the note portion to stand out a bit more.
tweaked the state note to also stand out more
2017-11-22 15:17:45 -08:00
Mircea Ulinic
101e8f0837
Mention the new opts in the Oxygen release notes
2017-11-22 12:50:04 +00:00
Benedikt Werner
6900e6ece1
Merge branch 'develop' into accept-minions-from-grains
2017-11-17 19:35:53 +01:00
Mircea Ulinic
0320174ea4
Add doc note regarding static grains on proxy minions
2017-11-15 13:19:03 +00: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
Thomas Phipps
d148e39dda
change from md to rst for code reference
2017-11-13 15:15:13 -07:00
Thomas Phipps
955e305bda
fix bad english, as requested by cachedout
2017-11-13 11:49:30 -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
Gareth J. Greenaway
45c9a233dc
Merge branch 'develop' into req_any
2017-11-13 09:16:56 -07:00
Vitaliy
43e4861fc4
Fixed minor spelling mistake.
2017-11-10 12:30:12 -05:00
Thomas Phipps
7256fcc1c9
update note to take into account grains_cache
2017-11-08 16:36:38 -08:00
Gareth J. Greenaway
a8e495f18f
Updating documentation and release notes.
2017-11-08 16:06:44 -08:00
Nicole Thomas
8e99aeed6a
Merge pull request #44415 from vernondcole/vagrant_cloud_minor_revisions
...
Vagrant and saltify cloud minor revisions
2017-11-08 15:22:18 -07:00
Erik Johnson
5932e8a8ae
Merge pull request #44407 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-11-08 11:50:05 -08:00
Nicole Thomas
76f3c001ee
Merge pull request #44430 from thatch45/doc_fix1
...
make it clear that disabling the job cache is bad
2017-11-07 15:53:10 -07:00
Thomas Phipps
aca0405b26
add a note that describes grain rebuilding on restart and refresh
2017-11-07 14:51:32 -08:00
Nicole Thomas
a29eeeec66
Fix a couple of small spelling errors
2017-11-07 12:16:28 -07:00
Thomas S Hatch
bed56e9dd7
make it clear that disableing the job cache is bad
2017-11-07 10:14:40 -07:00
Ch3LL
38ca5520f0
Fix orch doc from pillat.get to pillar.get
2017-11-07 11:36:10 -05:00
Volodymyr Samodid
0c7f63e9d4
fix docstring errors during rendering
2017-11-07 10:24:56 +02:00
Vernon Cole
51a15cb2fc
try to ping node before Wake on Lan
2017-11-06 10:56:41 -07:00
rallytime
2c052e34b3
Merge branch '2017.7' into 'develop'
...
Conflicts:
- .gitignore
- salt/modules/win_lgpo.py
- salt/utils/__init__.py
- tests/integration/spm/test_build.py
- tests/unit/test_pydsl.py
2017-11-05 20:28:51 -07:00
