Commit Graph

4942 Commits

Author SHA1 Message Date
Daniel Wallace
38aeb7ad5f
add enable_ssh documentation 2017-12-28 07:49:05 -07:00
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
twangboy
467013a08f
Fix punctuation and erroneous characters 2017-12-21 13:11:24 -07:00
twangboy
50b247a001
Update docs and help 2017-12-20 19:43:26 -07:00
twangboy
42607982cb
Update docs for new support
Fix some types in the help for the installer
2017-12-19 11:10:05 -07:00
Nicole Thomas
04a2ea8cd1
Merge pull request #45019 from rallytime/merge-oxygen
[oxygen] Merge forward from 2017.7 to oxygen
2017-12-16 08:16:57 -05:00
Nicole Thomas
567c363e5c
Merge pull request #44989 from vutny/oxygen-doc-schedule-util-duplicated
[Oxygen] [DOC] Add doc page reference for schedule util module
2017-12-15 14:49:48 -05:00
Nicole Thomas
653ad2a224
Merge pull request #44946 from terminalmage/unicode-file
[PY3] Update file state/execution modules and associated files with unicode_literals
2017-12-14 16:26:50 -05:00
rallytime
3e319d50b3
Merge branch '2017.7' into 'oxygen'
Conflicts:
  - README.rst
  - salt/modules/win_pkg.py
  - salt/utils/process.py
2017-12-14 13:01:29 -05:00
Denys Havrysh
da5e580f8c
[DOC] Add doc page reference for schedule util module 2017-12-14 16:53:07 +02:00
Erik Johnson
c3332c857f
Clarify jinja filter documentation 2017-12-13 16:43:45 -06:00
Erik Johnson
1bfc53fc57
Update file state/execution modules and associated files with unicode_literals
This updates the file state and execution modules to use
unicode_literals. Since the serializers and the cmd module are touched
by the file state/exec module, those are also updated here, as well as
the cmd state module, for good measure.

Additionally, I found that salt.utils.data.decode_dict (and decode_list)
are misnamed for what they actually do. Since they *encode* the
contents, the functions should be named encode_dict and encode_list,
respectively. And we also should have counterparts which actually
decode, so I've added them. The compatibility functions from salt.utils
still use the old "decode" names to preserve backward compatibility, but
they now invoke the renamed "encode" functions in salt.utils.data. Note
that this means that the compatibility functions
salt.utils.decode_dict/list, and their cognates in salt.utils.data now
do different things, but since the move to salt.utils.data is also
happening in the Oxygen release this is as good a time as any to correct
this oversight.

I've updated the jinja filter docs to include information on the renamed
jinja filters, and also added a section on jinja filter renaming to the
Oxygen release notes. There was another filter that I renamed during the
process of moving functions from salt.utils which I did not properly
document in the release notes, so this is now included along with the
others.
2017-12-13 16:43:45 -06:00
Nicole Thomas
1c22cb04e6
Merge pull request #44634 from anitakrueger/fix-cassandra-cql-versions
Adding version 3 queries for Cassandra keyspaces and columns functions
2017-12-13 09:33:23 -05:00
Nicole Thomas
990c6284b2
Merge pull request #44678 from isbm/isbm-master-autodiscovery
Master/Minion auto-discovery
2017-12-12 18:42:09 -05:00
Anita Krueger
8540a6b017
Adding documentation for new Cassandra v3 support 2017-12-12 20:51:22 +00:00
mvivaldi
d23ac4eabc Fix for the jinja documentation 2017-12-12 17:35:46 +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
Bo Maryniuk
e803d1aa66 Fix documentation 2017-12-11 17:43:20 +01:00
Bo Maryniuk
7fb357d202 Update documentation about Minion/Master relation 2017-12-11 17:43:19 +01:00
Bo Maryniuk
f5cf2419cc Add initial documentation for current basic autodiscovery implementation 2017-12-11 17:43:19 +01: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