Commit Graph

7562 Commits

Author SHA1 Message Date
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
twangboy
5a5d70866a Change repo_ng to repo-ng 2017-07-03 14:15:35 -06:00
Mike Place
ec378c73ff Merge pull request #42020 from terminalmage/toctree-fix
Add the new docker state modules to the toctree
2017-06-30 15:58:27 -05:00
rallytime
c98470e557 Merge branch '2016.11' into '2017.7'
No conflicts.
2017-06-30 10:00:10 -06:00
Ch3LL
1de5e008a0 Add initial 2016.11.7 Release Notes 2017-06-30 11:32:10 -04:00
rallytime
3b87dbca12 Add the 'provider' key to salt.cloud.CloudClient.create()
Much like how the 'profile' key exists in this function, the
'provider' key must also exist for other salt-cloud functions
to work properly. Various salt-cloud functions rely on provider
being available (as it is always available when using cloud profiles),
and so it should be available when no profile is used as well.

Also adjusted some rst syntax in the cloud config file as well
as the documentation around the create() function. Passing in
kwargs as the docs originally suggested does not work.

Fixes #41971
2017-06-29 14:38:09 -06:00
Seth House
18dfa9893c Re-add msgpack to mocked imports 2017-06-29 13:49:45 -06:00
Seth House
5592e6e5d4 Revert "Allow docs to be built under Python 3" 2017-06-29 13:32:09 -06:00
Erik Johnson
bfa9836336 Add the new docker state modules to the toctree 2017-06-29 12:31:58 -05:00
Erik Johnson
f13ddeb394 Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7
Conflicts:
- doc/_themes/saltstack2/layout.html
- salt/auth/__init__.py
- salt/utils/schedule.py
2017-06-28 20:27:32 -05:00
David Boucha
bff050ad52 change out salt support link to SaltConf link 2017-06-28 14:54:01 -06:00
rallytime
7d7be2d375 Merge branch '2016.11' into '2017.7'
Conflicts:
  - doc/ref/configuration/master.rst
  - tests/integration/states/test_archive.py
  - tests/unit/transport/test_tcp.py
  - tests/unit/transport/test_zeromq.py
2017-06-28 10:48:37 -06:00
Ch3LL
2516ae1349 [2016.3] Bump latest release version to 2016.11.6 2017-06-28 11:24:57 -04:00
Ch3LL
fe4f5711d5 [2016.11] Bump latest release version to 2016.11.6 2017-06-28 11:24:17 -04:00
Mike Place
7aacddf6ef
Allow docs to be built under Python 3 2017-06-27 11:46:47 -06:00
Mike Place
ff67d47a2e Merge pull request #41516 from kstreee/fix-blocking-waiting-tcp-connection
Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications.
2017-06-26 09:41:38 -05:00
Bo Maryniuk
c2b5e50d50 Add missing doc info for pressrelease 2017-06-26 14:38:19 +02:00
Mike Place
c89cd2a4bf Merge pull request #41890 from cachedout/locale_doc
Locale doc
2017-06-22 12:34:46 -05:00
Mike Place
df5a112a9b Merge pull request #41904 from twangboy/docs_win_add_firewall
Fix anchor to _linux-iptables
2017-06-22 11:16:23 -05:00
twangboy
d49bfd02a4 Fix anchor to _linux-iptables 2017-06-22 09:46:29 -06:00
Mike Place
3bc07d2f7c
Line breaks 2017-06-22 09:24:55 -06:00
Mike Place
679040c04b
Locale doc 2017-06-21 16:06:59 -06:00
Ch3LL
4e1239d980 Add additional commits to 2016.11.6 release notes 2017-06-21 17:15:11 -04:00
Mike Place
87a252fda7 Merge pull request #41852 from Ch3LL/rn_2017_py
Update 2017 Release Notes with Python Messages
2017-06-20 12:17:04 -05:00
Mike Place
f720a849ba Merge pull request #41795 from isbm/isbm-suse-upstream-leftovers
Things, that didn't made to 2017.7 for some reasons
2017-06-20 09:28:21 -05:00
Ch3LL
75f93edff2 Update 2017 Release Notes with Python Messages 2017-06-20 09:55:13 -04:00
Mike Place
a4195f5246 Merge pull request #41841 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-06-19 18:01:11 -05:00
rallytime
2cfabc467c Merge branch '2016.11' into '2017.7'
Conflicts:
  - pkg/windows/req.txt
  - salt/modules/dockermod.py
2017-06-19 14:17:01 -06:00
C. R. Oldham
16a05a5554 Fix backticks and dropped clause. 2017-06-19 14:03:34 -06:00
C. R. Oldham
a6025c3c66 Clarify some LDAP issues driven by #38259 and #38293 2017-06-19 12:46:28 -06:00
Bo Maryniuk
fe97520bc7 Merge branch '2017.7' into isbm-suse-upstream-leftovers 2017-06-19 15:21:13 +02:00
Mircea Ulinic
fae959d24b Remove duplicate mattermost ref 2017-06-19 09:52:54 +00:00
Mircea Ulinic
d8dc8a338b Add redis cache reference 2017-06-19 09:52:33 +00:00
Mircea Ulinic
fd28d3385c Adding Jinja cross ref 2017-06-19 09:49:45 +00:00
garethgreenaway
4c8aa25080 Merge pull request #41813 from rallytime/add_new_doc_modules
Add new documentation file references to build system for 2017.7
2017-06-16 18:54:15 -07:00
Nicole Thomas
c3a49c9552 Merge pull request #41805 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-06-16 16:01:06 -06:00
Nicole Thomas
4c9a73d75f Merge pull request #41728 from twangboy/win_install_docs
Win install docs
2017-06-16 15:41:21 -06:00
rallytime
ff277bc458 Add new documenation file references to build system for 2017.7 2017-06-16 21:17:33 +00:00
rallytime
58262608cd Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/config/__init__.py
  - salt/master.py
  - salt/modules/zypper.py
  - tests/unit/modules/timezone_test.py
2017-06-16 10:43:02 -06:00
Bo Maryniuk
e9de0746ae Fix grain for os_family on SUSE series 2017-06-16 14:39:08 +02:00
rallytime
c828ad803a Add a bunch of config options to the various master/minion files that are missing
I started on these a while ago and never submitted them. I added a couple more today
and figured I should get these in.

Refs #32400
2017-06-15 16:21:47 -06:00
Mike Place
a46f6809df Merge pull request #41758 from twangboy/docs_win_add_master_config
Add Windows Master config information
2017-06-15 15:29:27 -05:00
twangboy
b6201bac33 Fix version numbers 2017-06-15 09:53:57 -06:00
twangboy
c3dc38587e Fix indentation 2017-06-15 09:49:13 -06:00
Mike Place
c58f3811ce Merge pull request #41746 from rallytime/version-added-nitrogen
Update Nitrogen references to 2017.7.0
2017-06-15 10:12:18 -05:00
Mike Place
e685858269 Merge pull request #41750 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-06-14 17:15:40 -05:00
twangboy
80ac6381c2 Add Windows Master config information 2017-06-14 15:15:46 -06:00
Ch3LL
fa368f21ac
Add Change Log to 2016.11.6 Release Notes 2017-06-14 16:00:50 -04:00
rallytime
89834e49c2 Merge branch '2016.3' into '2016.11'
Conflicts:
  - conf/master
  - salt/utils/schedule.py
2017-06-14 13:24:11 -06:00
twangboy
795a1aab4f Add instructions for Windows Firewall 2017-06-14 11:42:00 -06:00
rallytime
c5b75d030a Update Nitrogen references to 2017.7.0 in doc/* 2017-06-14 11:36:06 -06:00
twangboy
45975e299e Remove reference to Salt Enterprise 2017-06-14 09:39:29 -06:00
Mike Place
4b43ba3366 Merge pull request #41585 from cro/sign_minion_messages
Sign_minion_messages support
2017-06-13 16:14:40 -05:00
twangboy
22601201c4 Add note about salt-master on Windows 2017-06-13 15:09:38 -06:00
twangboy
d67c1dfbf7 Remove references to salt master installation 2017-06-13 15:02:44 -06:00
rallytime
bdf33d7f5f Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-06-13 09:26:05 -06:00
rallytime
5150916556 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/parted.py
2017-06-12 20:10:45 -06:00
Erik Johnson
6ec9dfb7f3 Update version in master-tops docs
This paragraphs is referring to #37322, which was pushed to Oxygen.
2017-06-12 17:20:09 -05:00
rallytime
c91ca5f809 Remove note about version incompatibility with salt-cloud
The note references very old versions of salt + salt-cloud and since
salt-cloud has been incorporated into salt for quite some time, this
notice is no longer needed.
2017-06-12 11:16:52 -06:00
C. R. Oldham
dadf4b851c Add documentation to the example master and minion configuration files.
Move minion event signing to a saner place.
Enable dropping messages when signature does not verify or when
minion is not adding the signature to its payloads.
2017-06-08 13:18:53 -06:00
Mike Place
94aa1876d4 Merge pull request #41546 from cloudflare/dns-grains
Add host_dns grain for napalm
2017-06-06 15:00:07 -05:00
Mircea Ulinic
564f2d1e3d Indent correctly the code block 2017-06-06 15:23:14 +00:00
Mircea Ulinic
b70df6e576 Reference new Jinja filters in the release notes 2017-06-06 15:15:06 +00:00
Mircea Ulinic
406e582479 Small adjustment 2017-06-06 15:14:47 +00:00
Mircea Ulinic
62cb2a1c7a More jinja references 2017-06-06 15:05:50 +00:00
Mircea Ulinic
bba8c27873 Restructure the Jinja topic to have refrences 2017-06-06 14:56:21 +00:00
Mircea Ulinic
2a8c5cef04 Add notes regarding other new features 2017-06-06 14:18:01 +00:00
Mircea Ulinic
b59760fae2 Fix indentation for better display 2017-06-06 13:52:01 +00:00
Mircea Ulinic
ad4e6e5ec5 salt.beacons.log instead of 'Log' 2017-06-06 13:46:38 +00:00
Mircea Ulinic
36985bb1ed Remove service state, not a new one 2017-06-06 13:45:02 +00:00
Mircea Ulinic
b6b6a51846 Index new modules introduced in Nitrogen 2017-06-06 13:41:32 +00:00
Mircea Ulinic
6b1b05129c Remove the reference to the profile outputter 2017-06-06 12:49:04 +00:00
Mircea Ulinic
fb12353a1d Insert note in the Nitrogen release 2017-06-01 11:42:53 +00:00
kstreee
94b9ea51eb Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications. 2017-05-31 18:28:18 +09:00
Mike Place
cec5af7ce3 Merge pull request #41437 from Ch3LL/fix_gce_net
Remove ex_subnetwork requirement for GCE
2017-05-26 17:04:06 -05:00
rallytime
de85b49b90 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/config/__init__.py
  - salt/modules/cp.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/gzip_util.py
  - tests/integration/shell/test_cp.py
2017-05-26 11:11:54 -06:00
Nicole Thomas
5bb9dac9ec Merge pull request #41413 from gtmanfred/nitrogen
Write tests for Venafi runner
2017-05-26 10:09:23 -06:00
Nicole Thomas
824f2d3b69 Merge pull request #41398 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-05-26 09:17:48 -06:00
Ch3LL
3f94964801
Remove ex_subnetwork requirement for GCE 2017-05-25 16:25:12 -04:00
Daniel Wallace
6dfb63f15d add venafi to table of contents 2017-05-25 10:27:40 -06:00
Daniel Wallace
343a0b206c fix doc 2017-05-25 10:26:54 -06:00
wgoulet
44dec966c8 Updated documentation for Venafi module with better examples & clarifications 2017-05-25 10:26:54 -06:00
David Boucha
5eb27571a0 Correct doc to actually blacklist a module 2017-05-24 17:22:36 -06:00
rallytime
9ff2694155 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - pkg/salt-minion.service
  - salt/modules/junos.py
  - salt/modules/localemod.py
  - salt/modules/win_system.py
  - salt/states/junos.py
  - tests/unit/modules/test_localemod.py
  - tests/unit/modules/test_win_powercfg.py
  - tests/unit/states/dockerng_test.py
2017-05-24 16:32:59 -06:00
Benjamin Drung
33a7f8b2ec Fix typos
lintian found several spelling errors.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2017-05-24 12:50:29 +02:00
rallytime
d2d9a3d29f Merge branch '2016.3' into '2016.11'
Conflicts:
  - doc/ref/cli/salt-cp.rst
  - salt/config/__init__.py
2017-05-23 15:58:14 -06:00
Ch3LL
0d3f5da0ec add spaces for code in docs 2017-05-23 11:35:20 -06:00
Ch3LL
42e614bb7d add title 2017-05-23 11:35:20 -06:00
Ch3LL
b02ec97cff add ability to expand disk size on creation of vm in nebula 2017-05-23 11:35:20 -06:00
Benjamin Drung
5b79a0a9f8 Do not require sphinx-build for cleaning docs
In a minimal build environment (no sphinx), the package cannot initially
clean itself because the upstream doc/Makefile checks for sphinx-build
executable and Debian doesn't get any benefit of that.

Thus do not check for the presence of sphinx-build when running the
clean or help target by adding a phony check_sphinx-build that does the
check for sphinx-build.

Debian bug: https://bugs.debian.org/851559
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2017-05-23 17:14:11 +02:00
Mike Place
337d00fbf9 Merge pull request #41352 from whiteinge/rest_cherrypy-cors-token
rest_cherrypy CORS fix & /token endpoint
2017-05-22 11:03:04 -05:00
Mike Place
8b45b577a9 Merge pull request #41356 from whiteinge/doc-full_return
Add full_return to release notes
2017-05-22 10:56:14 -05:00
Seth House
fa0b1e7d7e Add full_return to release notes 2017-05-21 16:27:40 -06:00
rallytime
c6c1d30c48 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/yumpkg.py
  - salt/spm/__init__.py
  - tests/unit/modules/test_zypper.py
  - tests/unit/utils/test_network.py
2017-05-20 17:07:34 -06:00
Seth House
f6ae3b4634 Add rest_cherrypy additions to the release notes 2017-05-20 15:59:46 -06:00
Mike Place
6bdb7cca7d Merge pull request #41327 from Ch3LL/add_2016.11.6_release
Add 2016.11.6 Release Notes
2017-05-19 13:05:08 -05:00
Mike Place
6ca65592da Merge pull request #41322 from Ch3LL/fix_release_2016.11.5_notes
Add patched packages warning to 2016.11.5 release notes
2017-05-18 16:53:25 -05:00
Ch3LL
e5fc0aeb9c
Add 2016.11.6 Release Notes 2017-05-18 14:17:35 -04:00
Ch3LL
9a1bf4205f
fix url refs in rst 2017-05-18 12:42:35 -04:00
Ch3LL
cde008ff77
Add patched packages warning to 2016.11.5 release notes 2017-05-18 12:24:53 -04:00
Ch3LL
520740d862
[2016.13] Bump latest release version to 2016.11.5 2017-05-18 09:40:08 -04:00
Ch3LL
cdb072c207
[2016.11] Bump latest release version to 2016.11.5 2017-05-18 09:39:04 -04:00
Mike Place
051259d469 Merge pull request #41218 from gtmanfred/roster
allow for syncing salt-ssh rosters on the master
2017-05-17 14:21:25 -05:00
Evgeny Akhmetkhanov
76104f23b4 Add basic auth for SPM 2017-05-14 15:32:55 +03:00
Erik Johnson
10dc695cc4 Make salt-cp work with larger files
This breaks the files into chunks to keep them from exceeding the max size
of a published command. It also adds recursion, allowing for entire
directories to be transmitted. Finally, it adds gzip compression, and
a "-n" flag to disable use of compression.
2017-05-12 15:13:28 -05:00
Daniel Wallace
836ee32ff6 allow for syncing salt-ssh rosters on the master 2017-05-12 13:36:46 -06:00
Mike Place
a0a2646007 Merge pull request #41194 from rallytime/md5-warning-cleanup
Update fingerprint hash type default from md5 to sha256
2017-05-12 11:13:18 -05:00
rallytime
bb0f8f32de Update fingerprint hash type default from md5 to sha256
This PR also removes the warnings that this default with change in
the Nitrogen release, updates the documetation accordingly, and adjusts
some of the affected tests.
2017-05-11 09:33:45 -06:00
rallytime
12a75c1108 Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-05-10 15:32:23 -06:00
twangboy
24b11ffdc2 Add release notes 2017-05-10 12:27:45 -06:00
Ch3LL
28371aa035
2016.11.5 release notes: add additional commits 2017-05-09 17:02:51 -04:00
rallytime
ef0df4a954 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/win_network.py
  - salt/modules/win_pkg.py
  - salt/utils/gitfs.py
  - tests/unit/modules/test_win_network.py
  - tests/unit/states/test_file.py
2017-05-09 14:32:49 -06:00
Nicole Thomas
d2ae7deff2 Merge pull request #41148 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-05-09 14:23:28 -06:00
Mike Place
2156395b2e Merge pull request #41147 from rallytime/bp-39676
Back-port #39676 to 2016.11
2017-05-09 12:40:43 -06:00
Mike Place
6fa41dc89d Merge pull request #41111 from terminalmage/issue41105
Allow "ssl_verify: False" to work with pygit2
2017-05-09 11:56:11 -06:00
rallytime
aba35e20dd Merge branch '2016.3' into '2016.11'
No conflicts.
2017-05-09 11:14:05 -06:00
Felix Dreissig
5b55fb2452 Fix comments about the "hash_type" option
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
2017-05-09 11:10:29 -06:00
Daniel Wallace
2370d9316b add user_data to digital ocean 2017-05-08 09:59:27 -06:00
Erik Johnson
f6a16956a0 Add note on lack of support for VSTS in older libssh2 releases. 2017-05-08 07:59:53 -05:00
Daniel Wallace
c038727a80 document clouds dynamic directory 2017-05-07 20:30:20 -06:00
Erik Johnson
8c6410e3cd Add notices about ssl_verify only working in 0.23.2 and newer 2017-05-05 17:04:23 -05:00
Erik Johnson
f73c4b7167 Add http(s) auth config docs for GitPython 2017-05-05 16:56:01 -05:00
rallytime
bb1917243e Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-05-05 10:11:11 -06:00
Ch3LL
96ed815687
Add 2016.11.5 release notes and change log 2017-05-04 14:16:18 -04:00
rallytime
c91bb18298 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/pip.py
  - salt/states/saltmod.py
2017-05-04 11:49:33 -06:00
Mircea Ulinic
e3c40ea81a Outputters txt ref 2017-05-04 09:33:45 -06:00
Mircea Ulinic
20b307a310 Add New Modules section 2017-05-04 09:33:45 -06:00
Mircea Ulinic
7c8f14977b More NAPALM notes 2017-05-04 09:33:45 -06:00
Nicole Thomas
c13f0dc2a8 Revert "Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings" 2017-05-03 16:49:39 -06:00
Nicole Thomas
2b47b7bec6 Merge pull request #41045 from terminalmage/clarify-gitfs-docs
Clarify gitfs docs
2017-05-03 16:24:54 -06:00
Erik Johnson
c757eda331 Clarify gitfs docs
This improves cross links to the per-remote docs from the master config
file documentation.
2017-05-03 13:34:56 -05:00
Mike Place
a1f83ebb1e Merge pull request #41033 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-05-03 11:13:42 -06:00
Mike Place
3626258f50 Merge pull request #40899 from rallytime/remove-md5-warning
Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings
2017-05-03 10:55:26 -06:00
rallytime
19a3ecd5b8 Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-05-03 09:59:09 -06:00
rallytime
fc756c595c Merge branch '2016.3' into '2016.11'
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
2017-05-02 12:52:59 -06:00
Mike Place
19894f68ca Merge pull request #40724 from cro/minion_key_revoke_cfg
Minion key revoke cfg
2017-05-02 11:18:05 -06:00
rallytime
8e4b679d5c Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/pip.py
2017-05-01 10:45:19 -06:00
rallytime
a69cd74f75 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/cloud/clouds/nova.py
  - salt/spm/__init__.py
2017-04-28 09:23:42 -06:00
rallytime
7f31e41aa6 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/pip.py
2017-04-28 09:20:59 -06:00
Mike Place
909d519ddb Merge pull request #40751 from rallytime/fix-39531
Use Salt's SaltYamlSafeLoader and SafeOrderedDumper classes for yaml.load/dump
2017-04-28 06:56:05 -06:00
Mike Place
8fdfe4ece6 Merge pull request #40935 from gtmanfred/softlayer
Attempt to connect to public ip address in softlayer
2017-04-28 05:43:57 -06:00
Erik Johnson
e494ae43e5 Add dockerng fixes to 2016.11.4 release notes 2017-04-27 14:07:29 -05:00
Daniel Wallace
d6eb11410f Attempt to connect to public ip address in softlayer
Unless private_ssh or private_wds is set.

Softlayer does not require that a public_vlan be set in order to build a server
with a public ip address.  It can also be cumbersome to keep track of multiple
public_vlans which can be configured at the account level if you have multiple
accounts.

Like other cloud providers softlayer should default to connecting to the
public_vlan unless private_ssh is set to True.
2017-04-27 12:22:13 -06:00
Erik Johnson
8c078f144c Add additional note about quoting within load_yaml 2017-04-27 11:13:01 -05:00
Erik Johnson
123b5cdc11 Add documentation for PyYAML's loading of time expressions
Also remove the notice about the handling of integer scalars starting
with zeroes, as this was fixed in 0.10.0 which is roughly 5 years old
now.
2017-04-27 10:59:49 -05:00
Cory Wright
2995a05c2b Make salt.auth.rest heading consistent with all other salt.auth documentation 2017-04-27 09:32:53 -04:00
rallytime
e2aa5e2f21 Add fingerprint_hash_type default value change to release notes 2017-04-26 10:47:28 -06:00
Nicole Thomas
7c10a419a1 Merge pull request #40866 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-04-25 16:42:11 -06:00
Mike Place
5d9dd3ad56 Merge pull request #40805 from terminalmage/moby
Alias moby to docker in Nitrogen (and later)
2017-04-24 22:37:53 -06:00
rallytime
5372f25fde Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/cloud/clouds/rackspace.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
2017-04-24 15:35:28 -06:00
Ch3LL
e7b604339d
[2016.11] Bump latest release version to 2016.11.4 2017-04-24 13:29:28 -04:00
Ch3LL
889540a313
[2016.3] Bump latest release version to 2016.11.4 2017-04-24 13:27:15 -04:00
Erik Johnson
0e229a1910 Add note about moby naming to Nitrogen release notes 2017-04-23 23:34:58 -05:00
Daniel Wallace
b60a8d013a remove rackspace from index 2017-04-21 09:23:05 -06:00
Daniel Wallace
559aa1d8b6 remove deprecated firstgen rackspace cloud driver 2017-04-21 08:59:56 -06:00
rallytime
0b96d52f71 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/win_pkg.py
2017-04-20 11:21:10 -06:00
Mike Place
5388ffa7a2 Merge pull request #40785 from alexproca/backport-winexec-selection
win_pkg: backport 2016.11 add msiexec override to enable selection of 32 or 64 msiexec.exe
2017-04-20 10:45:13 -06:00
Erik Johnson
f99259a6eb Fix inaccurate nodegroup docs
We should probably support defining nodegroups as a "dictlist" in the
future, but we don't right now, so the docs are currently inaccurate.
2017-04-20 10:07:19 -05:00
Alex Proca
91cafd5094 Add option to select 32 or 64 version of msiexec
Pass path to msiexec overloading msiexec parameter
2017-04-20 12:25:52 +03:00
rallytime
6493880bde Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-04-18 16:42:30 -06:00
Mike Place
e700d8183b Merge pull request #40745 from cro/vmware_disk_datastore_bp
Backport `Add support for specifying a datastore for new disks.` PR #36457
2017-04-18 14:00:50 -06:00
rallytime
62c4d37c2f Use salt.utils.yamlloader with SaltYamlSafeLoader as the Loader with yaml.load 2017-04-18 13:41:07 -06:00
C. R. Oldham
d24078d1a0 Add docs for "datastore" param for disks 2017-04-18 09:33:46 -06:00
C. R. Oldham
500d6b281d Document validity of a datastore key inside a disk definition. 2017-04-18 09:33:46 -06:00
Mike Place
785e6060a9 Add requested docs 2017-04-18 08:34:56 -06:00
rallytime
292f55600b Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/fileserver/s3fs.py
  - tests/unit/test_fileclient.py
2017-04-17 13:32:56 -06:00
C. R. Oldham
65ea8997b7 Add allow_minion_key_revoke config option 2017-04-17 13:20:45 -06:00
Ch3LL
d228fb6e02
Add 2016.11.4 Release Note ChangeLog 2017-04-14 17:17:03 -04:00
Nicole Thomas
ceedbf1a63 Merge pull request #40649 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-04-12 11:18:32 -06:00
Mike Place
4af8d08e43 Merge pull request #40581 from terminalmage/release_notes
Make scheduled change to osmajorrrelease grain, clean up Nitrogen release notes
2017-04-11 16:49:15 -06:00
rallytime
e90622bc22 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/dockermod.py
  - salt/modules/file.py
2017-04-11 15:03:34 -06:00
Nicole Thomas
4beb7b4e77 Merge pull request #40644 from rallytime/nitrogen-doc-update
Add autodoc modules for new files in nitrogen
2017-04-11 14:59:26 -06:00
rallytime
3a232ffe8b Add autodoc modules for new files in nitrogen 2017-04-11 19:31:33 +00:00
Erik Johnson
6cf9202bc8 Fix more formatting issues in nitrogen release notes
The wildcard versions docs should be grouped under the same top-level
bullet. Also, there was a stray execution module change that seems to
have tried to flee south. I have returned it to it's natural habitat.
2017-04-11 11:02:58 -05:00
Erik Johnson
c36c9465e6 Formatting fixes for the module.run changes
This fixes the RST formatting so that it renders properly in the
bulleted list format. It also makes some changes to the wording for
clarification purposes.
2017-04-11 11:02:58 -05:00
Erik Johnson
3bbebd7d82 os_release -> osmajorrelease
This is a typo fix
2017-04-11 11:02:58 -05:00
Daniel Wallace
a86b101ae6 add retries on authentications of the salt minion reconnecting 2017-04-10 14:53:26 -06:00
rallytime
2cd0c5e4ec Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
  - tests/unit/modules/test_pillar.py
2017-04-10 14:09:25 -06:00
Erik Johnson
f8bc423ef9 Merge pull request #40563 from terminalmage/merge-2016.3-2016.11
Merge-forward 2016.3 -> 2016.11
2017-04-07 10:08:19 -05:00
Joseph Hall
08d071bc68 Update Azure ARM docs 2017-04-06 09:43:19 -06:00
Erik Johnson
a6d68f50fe Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11 2017-04-06 10:15:47 -05:00
Nicole Thomas
4d7871e4d7 Merge pull request #40494 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-04-05 14:15:05 -06:00
rallytime
71f3c73150 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/template.py
  - salt/utils/pycrypto.py
  - tests/integration/modules/test_state.py
  - tests/unit/states/test_artifactory.py
  - tests/unit/test_template.py
2017-04-05 13:02:14 -06:00
Mike Place
28fc048030 Merge pull request #40464 from terminalmage/userdata-renderer
salt-cloud: Do not pass userdata_file through yaml renderer
2017-04-05 11:32:06 -06:00
Mike Place
ee5f891002 Merge pull request #40523 from s0undt3ch/features/py3
[WIP] A Little House Keeping and Addressing Py3 test suite leakage
2017-04-05 10:58:32 -06:00
Nicole Thomas
990bde4c07 Merge pull request #40530 from dmurphy18/aix_docupd
Update release information for 2016.11.4 for additional AIX support
2017-04-05 10:20:22 -06:00
Pedro Algarvio
c98920c5fb Merge pull request #40535 from tonybaloney/doc_fix
Update hacking.rst
2017-04-05 09:34:39 +01:00
Anthony Shaw
97044bd998 Update hacking.rst
this one is wrong too
2017-04-05 15:12:08 +10:00
Anthony Shaw
25ec20ebb0 Update hacking.rst
Small error in the instructions
2017-04-05 15:08:40 +10:00
Erik Johnson
73f4c43e2a Allow for userdata_template to be disabled in a cloud_profile
This handles the case where a global value has been set and it is
necessary to disable it for a single profile.
2017-04-04 15:41:43 -05:00
Erik Johnson
b440d0c679 Update 2016.11.4 release notes for userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00
Erik Johnson
b580654f85 Update cloud docs to reflect userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00
Erik Johnson
a6064fb2e4 Rename userdata_renderer -> userdata_template in master config docs 2017-04-04 15:41:43 -05:00
Erik Johnson
eddbd41265 Openstack did not have templating support for userdata_file before 2016.11.4 2017-04-04 15:41:43 -05:00
Erik Johnson
a85a416c72 Add userdata_renderer fix info to 2016.11.4 release notes 2017-04-04 15:41:43 -05:00
Erik Johnson
111188742a Add documentation for userdata_renderer 2017-04-04 15:40:50 -05:00
David Murphy
fd93caf206 Added further support for functionality on AIX for 2016.11.4 2017-04-04 13:57:37 -06:00
Mike Place
7a04ed2439 Merge pull request #40497 from DSRCorporation/features/39275_memcache
Memcache documentation and minor updates.
2017-04-04 13:55:17 -06:00
David Murphy
17b58917f2 Update release information for new AIX support 2017-04-04 13:51:14 -06:00
Mike Place
fe9bc95b26 Merge pull request #40513 from terminalmage/fileserver-design-docs
Add initial developer docs on the fileserver and client
2017-04-04 13:37:35 -06:00
Erik Johnson
906d02f395 Add a section on updating the fileserver 2017-04-04 13:06:45 -05:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration 2017-04-04 18:58:19 +01:00
rallytime
8e480fffb5 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/runners/saltutil.py
2017-04-04 11:15:41 -06:00
Pedro Algarvio
785698d2ce
Import for the original module 2017-04-04 18:04:38 +01:00
Pedro Algarvio
8031ac0209
Move mixins to tests.support.mixins.
The adapted config mixin get config methods are not static methods
2017-04-04 17:29:34 +01:00
Erik Johnson
4e3a2d066a Add a section on the cp module 2017-04-04 10:00:52 -05:00
Denis Fondras
a58e320f41 Set True instead of 1 2017-04-04 14:50:03 +02:00
Erik Johnson
85b9bb4072 Fix label for RST link 2017-04-04 00:28:12 -05:00
Erik Johnson
6329d3580a Add initial developer docs on the fileserver and client
This may be expanded, but this gives a brief overview.
2017-04-03 23:56:08 -05:00
Mike Place
30f2593408 Merge pull request #40478 from cloudflare/add-new-funs
Add new functions to the net module
2017-04-03 16:31:24 -06:00
Mike Place
f6803bbd6c Merge pull request #40475 from cloudflare/yang-state
New state module: NAPALM YANG
2017-04-03 16:30:54 -06:00
Mike Place
ae43cb69e9 Merge pull request #40458 from cloudflare/napalm-syslog
New engine: Napalm syslog
2017-04-03 16:27:10 -06:00
Daniel Wallace
6e2f9080ca update docs for logging handlers 2017-04-03 16:04:53 -05:00
Thomas S Hatch
6279f7c120 fix do to pre correct on python randome function 2017-04-03 14:50:07 -06:00
Erik Johnson
0088a850bc Merge pull request #40284 from The-Loeki/cache-roster2
cache roster: Add SDB support, improve documentation
2017-04-03 15:21:01 -05:00
Thomas S Hatch
66b9515af7 Fix up the doc for failover clarity 2017-04-03 13:24:56 -06:00
Mircea Ulinic
a0d93e0021 Merge branch 'develop' into add-new-funs 2017-04-03 22:11:26 +03:00
Dmitry Kuzmenko
82c45b1a52 Memcache documentation and minor updates. 2017-04-03 19:51:50 +03:00
rallytime
8111909bb1 Merge branch '2016.3' into '2016.11'
Conflicts:
  - doc/topics/master_tops/index.rst
  - salt/runners/saltutil.py
2017-04-03 10:41:01 -06:00
Mircea Ulinic
f7e5473a23 Insert new funs into Nitrogen release notes 2017-04-02 11:05:35 +00:00
Mircea Ulinic
66d99b520c Index netyang state 2017-04-01 19:06:35 +00:00
Mircea Ulinic
24cdabd3d4 Netyang autodoc 2017-04-01 18:07:08 +00:00
Mircea Ulinic
0e03c9ba14 Add nitrogen release note for napalm-yang 2017-04-01 02:48:09 +00:00
Mircea Ulinic
b878fe867a napalm_yang module autodoc 2017-04-01 02:48:02 +00:00
Mike Place
bda781d8f9 Grammar fix 2017-03-31 14:02:48 -06:00
rallytime
2d73fca4d0 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/win_dsc.py
  - salt/modules/win_psget.py
  - tests/unit/utils/vmware_test/test_cluster.py
  - tests/unit/utils/vmware_test/test_common.py
  - tests/unit/utils/vmware_test/test_connection.py
  - tests/unit/utils/vmware_test/test_datacenter.py
  - tests/unit/utils/vmware_test/test_host.py
2017-03-31 10:09:56 -06:00
Mircea Ulinic
9974c18f8a Add napalm_syslog note into Nitrogen release 2017-03-31 16:08:32 +00:00
Mircea Ulinic
01f18ab611 Correct Nitrogen release notes typo 2017-03-31 16:04:10 +00:00
Mircea Ulinic
11f090fec9 Add napalm_syslog autodoc 2017-03-31 16:03:16 +00:00
Mike Place
1e47120cbb Merge pull request #40381 from terminalmage/issue40355
Support defining nodegroups as a dictlist as well as a dict
2017-03-30 16:31:12 -06:00
Nicole Thomas
fbbe0127f5 Merge pull request #40432 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-03-30 15:57:57 -06:00
Mike Place
b62c8c2965 Merge pull request #40414 from chaseadamsio/develop
docs: fix typo in states/index.rst
2017-03-30 15:00:38 -06:00
Lukas Raska
24cc9b2a0c [WIP] Refactor Elasticsearch execution and state modules (#40192)
* Add Ingest pipeline methods to Elasticsearch execution module

* Refactor Elasticsearch execution module and properly handle exceptions

* Throw CommandExecutionError in methods applicable for different Elasticsearch versions

* Refactor Elasticsearch states to reflect execution module changes

* Add state for managing Elasticsearch pipelines

* Fix few typos in Elasticsearch module, return None when deleted document doesn't exist

* Implements stats and health methods for Elasticsearch

* Add Elasticsearch methods to open/close index, manage search templates and repositories

* Merge existing Elasticsearch states into single one, add Search Template handling

* Add index alias state for Elasticsearch, fix documentation

* Catch all global exceptions in Elasticsearch states, unit test all of them

* Implement few Unit tests for Elasticsearch execution module, merge fixes into deprecated elastic states

* Implement additional unit tests for Elasticsearch execution module

* Finalize Elasticsearch module documentation
2017-03-30 13:22:58 -06:00
rallytime
1792acedc0 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/template.py
  - tests/unit/modules/dockerng_test.py
2017-03-30 12:32:24 -06:00
rallytime
d5576d75e7 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/crypt.py
2017-03-30 12:21:44 -06:00
Erik Johnson
0d7b0c4ef0 Improve the master_tops documentation 2017-03-30 11:56:15 -05:00
Chase Adams
f2d855bfbf docs: fix typo in states/index.rst 2017-03-30 04:41:04 -07:00
Chase Adams
b9982e3884 docs: fix typo in states/index.rst 2017-03-30 04:29:31 -07:00
Nicole Thomas
48986ca16f Merge pull request #40393 from holmboe/saltssh-ubuntu1604-python2-docfix
Document how to install Python 2 on an Ubuntu 16.04 host with salt-ssh
2017-03-29 16:50:14 -06:00
Roald Nefs
21f161fecc fix Ubuntu notation in docs/faq.rst
Fixed Ubuntu notation in docs/faq.rst: changed Ununtu to Ubuntu.
2017-03-29 20:09:55 +02:00
Henrik Holmboe
311f9c86ee Document how to install Python 2 on an Ubuntu 16.04 host with salt-ssh 2017-03-29 17:47:03 +02:00
Ch3LL
f532ec5288 initial 2016.3.7 release notes 2017-03-29 09:34:03 -06:00
Erik Johnson
c7817d1e00 Support defining nodegroups as a dictlist as well as a dict
Much of salt uses these "dictlist" structures, because it looks pretty
when rendered as YAML. This adds this support to nodegroups as well.
2017-03-29 00:43:58 -05:00
rallytime
52edbffc85 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/cache/all/index.rst
  - doc/topics/cache/index.rst
  - salt/cache/localfs.py
  - salt/modules/boto_rds.py
  - salt/roster/cloud.py
  - salt/states/virtualenv_mod.py
  - tests/integration/states/test_archive.py
  - tests/unit/modules/test_dockermod.py
  - tests/unit/states/dockerng_test.py
2017-03-28 17:09:30 -06:00
Pedro Algarvio
9322630126 Merge pull request #40138 from s0undt3ch/features/py3
Fix unit tests mocking
2017-03-28 22:34:32 +01:00
Ch3LL
7597d96edb [2016.11] Bump previous version to 2016.3.6 2017-03-28 12:39:45 -06:00
Ch3LL
a02fa7dd1f [2016.3] Bump previous version to 2016.3.6 2017-03-28 12:38:45 -06:00
Ch3LL
474c62328b Bump previous version to 2016.3.6 2017-03-28 12:37:13 -06:00
Pedro Algarvio
5df3054f47
Add minimal documentation about LoaderModuleMockMixin 2017-03-28 19:04:05 +01:00
Pedro Algarvio
7dc11df8ef
Update existing tests documentation. 2017-03-28 19:04:05 +01:00