Commit Graph

5247 Commits

Author SHA1 Message Date
Damon Atkins
325a9f0f66
Update 2016.11.9.rst 2018-01-05 01:51:14 +11:00
Damon Atkins
4da9200b9c
Update 2016.11.9.rst 2018-01-05 01:46:20 +11:00
Damon Atkins
126aee36ac
Update 2016.11.9.rst 2018-01-05 01:38:22 +11:00
Damon Atkins
1c01967943
Update 2016.11.9.rst 2018-01-05 01:36:57 +11:00
sumeetisp
1b4806e2b9
Updating python version
As 2017.7 does not support python 2.6 documentation needs to be updated to reflect this dependency
2018-01-04 10:56:56 +05:30
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
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
Mike Place
06afbe4214
Merge pull request #44275 from rallytime/arch-doc
Doc updates for architecture.rst file
2017-10-31 10:49:41 -06:00
Mike Place
d9a4cc22da
Merge pull request #44328 from rallytime/doc-fixes
Add some clarifications to event and architecture documentation
2017-10-31 10:21:37 -06:00
rallytime
0574df20ce
Add some clarifications to event and architecture documentation 2017-10-29 15:08:57 -04:00
Benedikt Werner
8f2693237c
Fixed and improved autoaccept grains docs 2017-10-29 14:02:36 +01:00
Benedikt Werner
fbe4fa81d5
Added docs for autoaccepting grains 2017-10-29 13:53:49 +01:00
Nicole Thomas
9fc7fde8d2
Merge pull request #43885 from garethgreenaway/43825_swap_total_grain
[develop] Adding swap_total to core grains
2017-10-27 13:01:11 -04:00
Nasenbaer
35c6a02689 Add sentry config deprecation to release notes 2017-10-26 10:29:43 +02:00
David Boucha
c919648ab4
Fix documentation grammar and spelling errors 2017-10-25 17:24:26 -06:00
Federico Pires
e7aebf46ce Support softlayer dedicated host in salt-cloud.
Update docs as well.
2017-10-25 10:58:12 -03:00
rallytime
fa7d290b7c
Doc updates for architecture.rst file
- A couple of spelling fixes
- Formatting fixes to make sure numbered lists display correctly
- Remove header that was confusing
2017-10-25 09:46:56 -04:00
Vernon Cole
b7c0182d93
correct and clarify documentation 2017-10-20 09:24:26 -06:00
Vernon Cole
cea457efa0
more better documentation, fix parameter handling 2017-10-19 20:14:07 -06:00
Vernon Cole
d3769b3568
add saltify wake-on-lan and document it 2017-10-19 20:14:07 -06:00
Mike Place
866a78a673 Merge pull request #44176 from vernondcole/simplify-saltify
Simplify saltify cloud driver
2017-10-19 14:37:17 -05:00
Nicole Thomas
e52aac2587 Merge pull request #43649 from twangboy/win_installer_multimaster
Add support for multimaster setup
2017-10-19 09:20:44 -04:00
Gareth J. Greenaway
bcee88ce77
Adding note about new swap_total grain to release notes for Oxyten. 2017-10-18 14:57:32 -07:00
Vernon Cole
805d5106ed
remove references to salt-api from docs 2017-10-18 10:50:47 -06:00
rallytime
b8dc018178
Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/modules/opkg.py
  - salt/utils/templates.py
  - tests/unit/templates/test_jinja.py
2017-10-18 09:37:47 -04:00
Mike Place
73c3581864 Merge pull request #44037 from vernondcole/vagrant-cloud
Vagrant cloud and state modules
2017-10-17 14:36:38 -06:00
Tim Freund
9557504b75
Insert missing verb in gitfs walkthrough 2017-10-16 20:27:56 -04:00
Nicole Thomas
2fba45cd3f Merge pull request #44125 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.2 to 2017.7
2017-10-16 16:02:24 -04:00
rallytime
c0f16dae74
Merge branch '2017.7' into 'develop'
Conflicts:
  - doc/topics/tutorials/index.rst
  - salt/crypt.py
  - salt/modules/cmdmod.py
  - salt/modules/grains.py
  - salt/pillar/git_pillar.py
  - salt/roster/clustershell.py
  - tests/unit/states/test_augeas.py
  - tests/unit/utils/test_utils.py
2017-10-16 15:26:19 -04:00
Nicole Thomas
96dc6b0171 Merge pull request #44015 from gtmanfred/develop
convert jinja context to dictionary
2017-10-16 14:39:29 -04:00
rallytime
c4ae4a6b50
Merge branch '2017.7.2' into '2017.7'
Conflicts:
  - doc/topics/releases/2017.7.2.rst
2017-10-16 13:53:13 -04:00
twangboy
a0972704e5
Fix bad headings 2017-10-16 10:51:34 -06:00
twangboy
601d8bc5af
Add release notes 2017-10-16 10:51:34 -06:00
twangboy
e22b2a4856
Fix some grammer issues in the docs 2017-10-16 10:51:33 -06:00
twangboy
78124181cd
Fix typo 2017-10-16 10:51:33 -06:00
twangboy
7bcf8b48ec
Update documentation with new changes to installer 2017-10-16 10:51:33 -06:00
Benedikt Werner
1319c822bd
Fixed code snippet in unit testing doc 2017-10-16 17:23:23 +02:00
Erik Johnson
877abb89d0
Complete the salt.utils refactor
This moves the remaining 30 functions from salt.utils to new locations.
2017-10-15 09:43:31 -05:00
garethgreenaway
22dbed1e45 Merge branch 'develop' into vagrant-cloud 2017-10-13 13:08:50 -07:00
Nicole Thomas
76cc5ba689 Merge branch 'develop' into develop 2017-10-13 11:44:17 -04:00
Nicole Thomas
b617c85519 Merge pull request #44084 from senthilkumar-e/doc_update
Fixing a typo in the troubleshooting document
2017-10-13 10:29:50 -04:00
Nicole Thomas
0238a6d713 Merge pull request #44061 from Shinzu/develop
Add option to eagerly scrub the disk
2017-10-13 09:57:02 -04:00
Senthilkumar Eswaran
238941cd02 Fixing a typo in the troubleshooting document 2017-10-12 22:28:25 -07:00
Vernon Cole
42c0c6e6ef
lint and documentation fixes 2017-10-12 13:11:12 -06:00
Markus
820add5551
Added version tag 2017-10-12 20:30:55 +02:00
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
rallytime
8a0f948e4a Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/utils/versions.py
  - tests/unit/modules/test_boto_elb.py
  - tests/unit/modules/test_boto_secgroup.py
  - tests/unit/states/test_boto_vpc.py
2017-08-17 09:10:31 -04:00
rallytime
566ba4fe76 Merge branch '2016.3' into '2016.11'
Conflicts:
  - doc/conf.py
2017-08-17 09:03:44 -04:00
aajdinov
d365888489 Initial commit of oneandone salt cloud driver. 2017-08-17 08:03:01 +00:00
Vernon Cole
2a538f3bf4 Merge branch 'develop' into enhancement/saltify_d 2017-08-16 18:15:37 -06:00
rares-pop
1bbd1565d1 Merge branch 'develop' into develop 2017-08-16 10:52:48 +03:00
Denys Havrysh
44ed53b1df [DOCS] Fix link to Salt Cloud Feature Matrix 2017-08-16 10:26:45 +03:00
Jochen Breuer
1f1f910fd5 Fixed missing parenthesis
The closing parenthesis was missing.
2017-08-16 00:03:54 +02:00
Nicole Thomas
275122d04e Merge pull request #42834 from terminalmage/salt.utils.versions
Move 4 functions from salt.utils to salt.utils.versions
2017-08-15 17:28:24 -04:00
Erik Johnson
2b76029ded Move 4 functions from salt.utils to salt.utils.versions
This moves the following functions from salt.utils to salt.utils.versions:

- warn_until
- kwargs_warn_until
- compare_versions (as salt.utils.versions.compare)
- version_cmp
2017-08-15 12:53:57 -05:00
Ch3LL
1d8f827c58 Add Security Notice to 2017.7.1 Release Notes 2017-08-15 12:37:50 -04:00
Ch3LL
a6f902db40 Add Security Notice to 2016.11.77 Release Notes 2017-08-15 12:35:37 -04:00
Ch3LL
d75d3741f8 Add Security Notice to 2016.3.7 Release Notes 2017-08-15 12:33:27 -04:00
garethgreenaway
8b48341a36 Merge branch 'develop' into fixing_beacons 2017-08-15 09:00:09 -07:00
Nicole Thomas
d8b7afbbd1 Merge pull request #42928 from UtahDave/remove_stormpath2
Remove stormpath2
2017-08-15 10:09:23 -04:00
David Boucha
0ceb8009c7 remove Stormpath module, states and docs 2017-08-14 16:03:00 -06:00
David Boucha
ed7430d91b Add note about removal to release notes 2017-08-14 15:54:19 -06:00
Gareth J. Greenaway
702e588b36 Updating the release notes to include more examples of old & new behavior for beacon configuration. Updating example documentation in one beacon. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
42afd62de8 Adding note in release notes for beacon configuration deprecation. 2017-08-14 12:04:38 -07:00
amalleo25
4e46c968e6 Update joyent.rst
Missing colon in example cloud.profiles.d config file.
2017-08-14 14:35:50 -04:00
rallytime
78e744bda4 Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/client/mixins.py
  - salt/fileclient.py
  - salt/modules/status.py
  - tests/integration/states/test_npm.py
2017-08-14 14:21:17 -04:00
Nicole Thomas
c6ca7d639f Merge pull request #42889 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-08-14 10:16:19 -04:00
Mircea Ulinic
93be79a135 Index eos under the installation instructions list 2017-08-12 23:15:11 +01:00
Mircea Ulinic
f903e7bc39 Minor eos doc correction 2017-08-12 23:11:25 +01:00
Nicole Thomas
a3635926f3 Merge pull request #42879 from rallytime/oxygen-formatting
Update header markup for subsections
2017-08-11 15:24:30 -04:00
rallytime
29ff19c587 Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/config/__init__.py
  - salt/states/dockerng.py
  - salt/utils/cloud.py
2017-08-11 15:17:19 -04:00
rallytime
48445ff182 Update header markup for subsections
The header section markup was incorrect in sections with sub-sections,
displaying the header text as smaller than the sub-section header text.

This fixes the header sizes
2017-08-11 10:17:22 -04:00
Nicole Thomas
459fdedc67 Merge pull request #42678 from frankiexyz/2017.7
Add eos.rst in the installation guide
2017-08-11 09:58:36 -04:00
amalleo25
559a2d448c Update joyent.rst
Missing colon in example cloud.profiles.d config file.
2017-08-10 23:08:38 -04:00
Erik Johnson
35e05c9515 Add note about git CLI requirement for GitPython to GitFS tutorial 2017-08-10 16:47:47 -05:00
rallytime
08bbcf5790 Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/modules/win_pkg.py
2017-08-10 14:51:27 -04:00
Steven Joseph
50f1691cd8 Update documentation for azure arm dependencies 2017-08-10 13:19:45 +10:00
Erik Johnson
3184168365 Use explicit unicode strings + break up salt.utils
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.

A summary of the changes in this PR is as follows:

* Moves the following functions from `salt.utils` to new locations
  (including a deprecation warning if invoked from `salt.utils`):
  `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
  `dequote`, `is_hex`, `is_bin_str`, `rand_string`,
  `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
  `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
  `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
  `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
  `is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
  `salt/utils/__init__.py` for better organization, so we can keep the
  deprecated ones separate from the ones yet to be deprecated as we
  continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
  unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
  import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
  accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
  such that it returns a string matching the passed size. Previously
  this function would get `size` bytes from `os.urandom()`,
  base64-encode it, and return the result, which would in most cases not
  be equal to the passed size.
2017-08-08 13:33:43 -05:00
Nicole Thomas
3f59b22105 Merge branch 'develop' into develop 2017-08-08 13:53:43 -04:00
Ch3LL
90a2fb66a2 Fix typo for template_dict in http docs 2017-08-07 16:45:42 -04:00
vernoncole
e970b0623a flesh out saltify driver
(cherry picked from commit 0a730fb)
2017-08-07 10:21:48 -06:00
vernoncole
32ebe90fa4 make suggested changes to docs
(cherry picked from commit 25ca2a8)
2017-08-07 10:21:48 -06:00
vernoncole
681d2cd4bc manual merge of two conflicts 2017-08-07 10:21:48 -06:00
rallytime
f20f3742cb Merge branch '2017.7' into 'develop'
Conflicts:
  - tests/unit/test_crypt.py
2017-08-07 10:43:06 -04:00
Daniel Wallace
bca17902f5 add version added info 2017-08-03 09:01:34 -06:00
Frankie Hui
1598571f52 Add eos.rst in the installation guide 2017-08-02 17:47:31 +08:00
Alek Tant
2f9645c0d0 Merge branch 'develop' into patch-1 2017-07-31 21:17:13 -04:00
Mike Place
9d27719d3c Merge branch 'develop' into develop 2017-07-31 18:13:19 -05:00
Mike Place
b5304e73db Merge pull request #42426 from michaelgibson/features/issue-42280
adding 2-factor auth capability to ldap eauth module - #42280
2017-07-31 15:01:43 -05:00
Mike Place
558bdb346a Merge pull request #42594 from rallytime/preflight_cmds
Add a "preflight_cmds" option to salt-cloud
2017-07-31 14:45:27 -05:00
Seth House
f3c37fe71f Add clarification on how to participate once in the Contributors team
The intent here is to make an implicit rule the community had been
practicing into an explicit one that can be linked/referenced.
2017-07-31 10:42:12 -06:00
Alek Tant
1729cc2919 Update libvirt.rst
The libvirt-python package is required to run salt-cloud against libvirt/KVM hosts. If it is not installed on the machine running salt-cloud, the crytic error below is all there is to go by:
```
[WARNING ] The cloud driver, 'libvirt', configured under the 'hagrid' cloud provider alias, could not be loaded. Please check your provider configuration files and ensure all required dependencies are installed for the 'libvirt' driver.
In rare cases, this could indicate the 'libvirt.get_configured_provider()' function could not be found.
Removing 'libvirt' from the available providers list
```
2017-07-30 18:33:47 -04:00
garethgreenaway
91236cf842 Merge branch 'develop' into preflight_cmds 2017-07-27 16:34:34 -07:00
Nicole Thomas
e2dd443002 Merge pull request #42601 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-07-27 16:32:06 -06:00
Nicole Thomas
22eea389fa Merge pull request #42290 from isbm/isbm-module_run_parambug_42270_217
Backport of #42270
2017-07-27 16:30:05 -06:00
Michael Gibson
5099566c43 Merge branch 'develop' into features/issue-42280 2017-07-27 14:10:46 -06:00
rallytime
36a1bcf8c5 Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/modules/win_wua.py
  - salt/utils/schedule.py
  - tests/unit/modules/rabbitmq_test.py
2017-07-27 14:00:15 -06:00
C. R. Oldham
2cc808e2b8 Add different bindpw behavior to the Oxygen release notes. 2017-07-27 13:56:13 -06:00
rallytime
6342971eca Add a "preflight_cmds" option to salt-cloud
This option allows users to specify a list of shell commands that should
be executed on the VM right before the bootstrap script runs (or whatever
deploy script is set).
2017-07-27 11:43:58 -06:00
rallytime
1f0b90aa57 Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/engines/slack.py
2017-07-26 17:51:36 -06:00
rallytime
46715e9d94 Merge branch '2017.7.1' into '2017.7'
Conflicts:
  - doc/topics/releases/2017.7.1.rst
2017-07-26 14:29:24 -06:00
rallytime
7bcaa5a4cc small markup fix for title 2017-07-26 09:00:45 -06:00
Ch3LL
d066b599ca add changelog to 2017.7.1 release notes 2017-07-26 09:00:34 -06:00
Ch3LL
fb69e71093 add changelog to 2017.7.1 release notes 2017-07-25 21:10:58 -04:00
Nicole Thomas
ddc0286d57 Merge pull request #42462 from rallytime/version-deprecation
Remove deprecated rc_info function from version.py
2017-07-25 17:06:12 -06:00
Nicole Thomas
bed053e956 Merge pull request #42549 from cachedout/doc_42254
Document change in #42254
2017-07-25 16:30:03 -06:00
rallytime
2d14337251 Remove deprecated rc_info function from version.py
``pre_info`` should be used instead. Updated the release notes as
well to reflect this change.
2017-07-25 14:50:32 -06:00
Mike Place
232cefc06b
Document change in #42254 2017-07-25 14:29:49 -06:00
Mike Place
7bc8b0eb85 Merge pull request #42254 from StackPointCloud/profitbricks_fixes
Minor error message improvement and documentation fix
2017-07-25 15:28:21 -05:00
Mike Place
1c7050dcd1 Merge pull request #42495 from clallen/add-ldoms-virtual-grain
Logical Domains support in virtual grain
2017-07-25 12:02:52 -05:00
Clint Allen
e3d7418685 Added release notes comment 2017-07-24 20:12:16 -05:00
Daniel Wallace
b7ebb4d81a these drivers do not actually have an issue.
Joyent does not use apache-libcloud, and is the only one with this issue.
2017-07-24 15:12:40 -06:00
nikolas
9d8715c984 Update link to fedora deploy script
salt-cloud is now in the main salt repo
2017-07-24 16:36:38 -04:00
rallytime
e3a6717efa Add info about top file to pillar walk-through example to include edit.vim
The pillar example in the "Pillar Makes Simple States Grow Easily" section does
not meniton that the new file `/srv/pillar/edit/vim.sls` created for the example
must be included in the pillar top file in order for the references to work.

This PR adds that documentation so that the example works correctly.

Fixes #42405
2017-07-24 12:17:41 -06:00
Nicole Thomas
994d3dc74a Merge pull request #42454 from terminalmage/jinja-docs-2017.7
Document future renaming of new rand_str jinja filter
2017-07-21 12:47:50 -06:00
rallytime
f723bf731a Remove root_user kwarg from bootstrap function in manage runner
This option was marked for removal in Oxygen. The bootstrap function
now relies on salt-ssh with roster entries instead.
2017-07-21 10:56:30 -06:00
Erik Johnson
98b661406e Document future renaming of new rand_str jinja filter
The name and the documentation for this filter are entirely inaccurate
for what it actually does. It will be renamed in the Oxygen release.
2017-07-21 09:21:38 -05:00
Mike Place
01fb4f35c7 Merge pull request #42395 from rallytime/no-more-nitrogen
Fix some Nitrogen references still present in develop
2017-07-20 16:45:45 -05:00
Erik Johnson
2fb986f5ca Merge pull request #42367 from rallytime/files-util
Move file-related utilities out of init file and into salt.utils.files.py
2017-07-19 16:55:52 -05:00
rallytime
9014ef3105 Fix some Nitrogen references still present in develop 2017-07-19 11:16:32 -06:00
Mike Place
c9972fe4fb Merge pull request #42383 from AndrewPashkin/revert-37003-gradual-pillar-loading
Revert "Make possible to reference previous pillars from subsequent pillars, as they specified in the top file"
2017-07-19 11:28:22 -05:00
Mike Place
7419e82cb2 Merge pull request #42362 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
2017-07-19 10:56:15 -05:00
Nicole Thomas
0f2ef2f85c Merge pull request #42346 from edgan/patch-2
Document use of python methods in jinja
2017-07-19 09:53:25 -06:00
Rares Pop
ccb34f604a release notes: adding persistent minion_blackout
Add the 'Persistent Minion Blackout' on the oxygen release notes.

Signed-off-by: Rares Pop <rares.pop@ni.com>
2017-07-19 16:32:00 +03:00
Andrew Pashkin
b0148c15c7 Revert "Make possible to reference previous pillars from subsequent pillars, as they specified in the top file" 2017-07-19 12:25:22 +03:00
Ch3LL
ce1c1b6d28 Add initial 2017.7.1 Release Notes File 2017-07-18 18:51:27 -04:00
Nicole Thomas
a175c40c1d Merge pull request #42364 from twangboy/release_notes_2017.7.0
Windows Package notes for 2017.7.0
2017-07-18 13:24:45 -06:00
Nicole Thomas
587138d771 Merge pull request #42363 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-07-18 12:40:48 -06:00
Nicole Thomas
ba799b2831 Merge pull request #42179 from rallytime/fix-42151
Fix some documentation issues found in jinja filters doc topic
2017-07-18 12:01:56 -06:00
Nathan Grennan
4985e68f61 Update index.rst 2017-07-18 10:38:17 -07:00
Mike Place
1b683f2fca Merge pull request #37003 from AndrewPashkin/gradual-pillar-loading
Make possible to reference previous pillars from subsequent pillars, as they specified in the top file
2017-07-18 12:13:56 -05:00
rallytime
ccf790a83f Update all references for moved functions to use "files" util
- fopen
- flopen
- fpopen
- safe_rm
- is_empty
- is_fcntl_available
2017-07-18 10:31:01 -06:00
twangboy
96517d1355 Add note about patched windows packages 2017-07-18 10:06:55 -06:00
rallytime
7aa31ff030 Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/grains/core.py
  - salt/modules/git.py
  - salt/modules/pillar.py
  - salt/states/saltmod.py
  - salt/states/user.py
  - tests/integration/states/handle_iorder.py
2017-07-18 09:05:43 -06:00
rallytime
f59ecb7ffe Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/executors/sudo.py
2017-07-18 08:57:55 -06:00
Nathan Grennan
0bfc1a2fb2 Document use of python methods in jinja 2017-07-17 12:24:41 -07:00
Mike Place
c84d6db548 Merge pull request #42186 from rallytime/fix-42166
Use long_range function for IPv6Network hosts() function
2017-07-17 13:39:35 -05:00
Mike Place
87361ca128 Merge pull request #42244 from alexbleotu/jinja_globals_gh
Jinja raise function and globals decorator
2017-07-17 13:16:36 -05:00
Mike Place
e588f235e0 Merge pull request #42269 from rallytime/fix-41721
Add some clarity to "multiple quotes" section of yaml docs
2017-07-17 12:38:17 -05:00
Mike Place
8f1cb287cf Merge pull request #42126 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-07-17 12:07:18 -05:00
Mike Place
c7b3f6a09a Merge pull request #42302 from rallytime/cloud-utils-fire-event-deprecation
Remove sock_dir deprecation warning from salt.utils.cloud.fire_event
2017-07-17 09:35:58 -05:00
rallytime
c406046940 Add clarification to salt ssh docs about key auto-generation.
Fixes #42267
2017-07-14 11:57:58 -06:00
rallytime
ffd3fae2c9 Add this change to the Oxygen release notes 2017-07-13 16:46:36 -06:00
rallytime
ccd78ed791 Remove Oxygen deprecation warning in lxc execution module 2017-07-13 16:42:42 -06:00
Bo Maryniuk
e38d432f90 Fix docs 2017-07-13 10:11:32 +02:00
Bo Maryniuk
1e8a56eda5 Describe function tagging 2017-07-13 10:11:21 +02:00
Bo Maryniuk
1d7233224b Describe function batching 2017-07-13 10:11:13 +02:00
Bo Maryniuk
1391a05d5e Bugfix: syntax error in the example 2017-07-13 10:11:07 +02:00
rallytime
f2250d474a Add a note about using different styles of quotes. 2017-07-12 17:08:23 -06:00
Mike Place
cb030114ec Merge branch 'develop' into profitbricks_fixes 2017-07-12 16:33:50 -05:00
SaltyCharles
2ff1d814b2 fix typo 2017-07-12 12:26:53 -07:00
Andrew Pashkin
7d59f7a6c6 Make possible to reference pillars, that come before current pillar in the top file 2017-07-12 19:03:05 +03:00
Nicole Thomas
63718024fd Merge branch 'develop' into jinja_globals_gh 2017-07-12 10:02:42 -06:00
Denys Havrysh
f1bc58f6d5 Utils: add example of module import 2017-07-12 11:08:34 +03:00
Nicole Thomas
5f01dccf8f Merge pull request #42214 from gtmanfred/develop
allow not verifying ssl winrm saltcloud
2017-07-11 17:33:21 -06:00
rallytime
38d9b3d553 Add some clarity to "multiple quotes" section of yaml docs
Fixes #41721
2017-07-11 17:28:45 -06:00
Thomas Dutrion
c31ded341c Remove duplicate instruction in Openstack Rackspace config example 2017-07-11 16:01:15 -06:00
Ethan Devenport
65e132f071 Provide better error message when datacenter is not found.
Corrected property name in documentation.

Updated library version dependency.
2017-07-11 17:40:05 +00:00
Alexandru Bleotu
346b1880e3 Merge branch 'develop' into jinja_globals_gh 2017-07-11 10:33:06 +01:00
shengis
e95316b145 Merge branch 'develop' into add_dns_for_azurearm 2017-07-10 23:01:52 +02:00
Aurélien FUSIL-DELAHAYE
340368fdac add custom dns support for azurearm provider
- added option in documentation : dns_servers
2017-07-10 13:35:08 +02:00
Thomas Dutrion
6144af034a
Remove duplicate instruction in Openstack Rackspace config example 2017-07-09 11:34:14 +02:00
rallytime
798d29276e Add note about "to_bytes" jinja filter issues when using yaml_jinja renderer 2017-07-07 15:14:06 -06:00
Daniel Wallace
ce6b05d237 add release note 2017-07-07 13:15:30 -06:00
Daniel Wallace
2dac634dd2 add document for winrm_verify_ssl 2017-07-07 13:15:30 -06:00
rallytime
8d960d463a Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/grains/core.py
2017-07-06 17:42:30 -06:00
rallytime
b8bcc0d599 Add note to various network_hosts docs about long_run for IPv6 networks 2017-07-06 17:36:18 -06:00
rallytime
1bbff572ab Fix some documentation issues found in jinja filters doc topic
These doc issues were all found in issue #42151. This commit takes
care of all of the issues presented in #42151 except for the last
task.
2017-07-06 11:46:23 -06:00
Arthur Lutz
686926daf7 Update aws.rst - add Debian default username 2017-07-06 11:08:06 -06:00
Nicole Thomas
df1ed8929d Merge pull request #42109 from arthurlogilab/patch-20
[doc] Update aws.rst - add Debian default username
2017-07-06 10:58:25 -06:00
Nicole Thomas
678d4d4098 Merge pull request #42141 from rallytime/bp-42098
Back-port #42098 to 2016.11
2017-07-06 09:11:49 -06:00
Ch3LL
e1694af39c Update builds available for rc1 2017-07-05 17:06:06 -04:00
twangboy
bd80243233 Change repo_ng to repo-ng 2017-07-05 13:56:11 -06:00
Nicole Thomas
afc19048bd Merge pull request #42131 from gtmanfred/release
Add stuff to release notes
2017-07-05 13:33:14 -06:00
Daniel Wallace
e2b3160c96 fix up PR 2017-07-05 10:41:26 -06:00
Daniel Wallace
6fbde35d11 add note about roster_defaults 2017-07-05 10:23:07 -06:00
Daniel Wallace
ea5ae2e468 add release note about about extmod blacklist and whitelist 2017-07-05 10:23:07 -06:00
Daniel Wallace
db0ed458d8 Update salt-master first before updating salt-minion
Fixes #42124
2017-07-05 10:23:07 -06:00
rallytime
8b35b367b3 Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/dockerng.py
2017-07-05 09:14:30 -06:00
Alexandru Bleotu
23f963f946 Added Errors section to jinja doc 2017-07-04 16:10:52 +01:00
Arthur Lutz
b78f179b19 [doc] Update aws.rst : typo fix 2017-07-04 14:21:11 +02:00
Arthur Lutz
8fcfb67ff5 Update aws.rst - add Debian default username 2017-07-04 14:00:10 +02:00
Ch3LL
d4e7b91608 Update releasecanddiate doc with new 2017.7.0rc1 Release 2017-07-03 23:06:54 -04:00
rallytime
c2822e05ad Remove references in docs to pip install salt-cloud
Instead, provide the option to use "-L" with the Bootstrap script.

Fixes #41885
2017-07-03 14:47:36 -06:00