valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
84,238 Commits 24 Branches 182 Tags 341 MiB
681d2cd4bc
Commit Graph

4686 Commits

Author SHA1 Message Date
rallytime
e1bd7ce10a Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-11 13:03:59 -06:00
Nicole Thomas
5cfaa908aa Bump code block example in 4 spaces 
This allows the code-block to be rendered correctly when the docs build.
 2017-05-11 10:28:10 -06: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
Peter C. Norton
3b50059992 Change docs to match what I see in the code 2017-05-10 19:13:08 -04:00
rallytime
4100e2b6a6 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-10 15:32:33 -06:00
rallytime
12a75c1108 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-10 15:32:23 -06:00
Nicole Thomas
ac5bda8839 Merge pull request #41117 from terminalmage/rename_env_blacklist_whitelist 
Rename the *_env_blacklist config opts to *_saltenv_blacklist
 2017-05-10 14:03:23 -06:00
twangboy
24b11ffdc2 Add release notes 2017-05-10 12:27:45 -06:00
Adam Mendlik
a0d08ed13f Allow saltify cloud provider to verify Windows credentials 2017-05-10 11:58:55 -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
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
4c099df8fa Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-09 11:27:55 -06:00
rallytime
aba35e20dd Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-05-09 11:14:05 -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
Erik Johnson
59737a34a5 Rename the *_env_blacklist config opts to *_saltenv_blacklist 
These were overlooked a while back when we deprecated env in favor of
saltenv.
 2017-05-06 23:11:33 -05: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
SaltyCharles
d27e37e3d9 update aws.rst for usage clarification 
`del_tags` requires `tags=`.
 2017-05-05 13:08:40 -07:00
rallytime
01a012bbdf Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-05 10:12:18 -06:00
rallytime
bb1917243e Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-05 10:11:11 -06:00
Mike Place
7efa7530f3 Merge pull request #41073 from tshepang/patch-1 
doc: make examples consistent with each other
 2017-05-05 10:06:34 -06:00
Ch3LL
96ed815687
Add 2016.11.5 release notes and change log 2017-05-04 14:16:18 -04:00
rallytime
319dc45c1d Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-05-04 11:51:32 -06: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
Tshepang Lekhonkhobe
a29045846d doc: make examples consistent with each other 
Also, show a more complex example, which makes removing the templating necessary
 2017-05-04 19:04:20 +02: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
Mircea Ulinic
ce55d85c96 Double 'that' 2017-05-04 09:17:17 +00:00
Mircea Ulinic
727d220942 More salt-minion on ntwrk gear notes 2017-05-04 09:09:08 +00:00
Mircea Ulinic
9317a4595c One more phrase at the end... 2017-05-04 09:09:08 +00:00
Mircea Ulinic
5e99a1737c Start working on network automation docs 2017-05-04 09:09:03 +00: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
Erik Johnson
ebae1d8fe9 Merge pull request #40985 from ekristen/feature/remote-as-formula 
[Feature] Turns a gitfs remote into a true "formula", merges specified branch into current saltenv
 2017-05-03 12:17:17 -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
Mircea Ulinic
a69e88055d Outputters txt ref 2017-05-03 15:13:05 +01:00
Mircea Ulinic
225014c3fb Add New Modules section 2017-05-03 11:50:28 +00:00
Mircea Ulinic
6c44452c90 More NAPALM notes 2017-05-03 11:37:40 +00:00
Erik Johnson
d6cd5056cf Enhance the Global Remotes docs 2017-05-02 16:37:56 -05:00
Erik Johnson
f73050fd0f mention all_saltenvs and link back to gitfs walkthrough 2017-05-02 16:37:47 -05: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
Nicole Thomas
1c0c53bcd0 Merge pull request #41006 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-02 12:49:23 -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
Mike Place
cc71347a7c Merge pull request #40973 from tonybaloney/libcloud_compute 
Introduce `libcloud_compute` execution module for Libcloud compute APIs
 2017-05-02 10:03:42 -06:00
rallytime
ecb962cdee Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-05-02 09:00:22 -06:00
Erik Johnson
74ef0bf1d7 Clarify that it is only all_saltenvs which is new in Oxygen 
Depending on how you read it, the previous version may have suggested
that all of the per-remote parameters are new in Oxygen. This makes it
more explicit that the all_saltenvs param is the only one new to Oxygen.
 2017-05-02 09:10:21 -05:00
Mike Place
42967eab99 Merge pull request #40893 from tonybaloney/libcloud_state 
Improvements to libcloud modules
 2017-05-01 13:58:25 -06:00
rallytime
8e4b679d5c Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/pip.py
 2017-05-01 10:45:19 -06:00
rallytime
a9fb83c28c Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-01 10:43:45 -06:00
Erik Kristensen
fa1e56ad14 rename to all_saltenvs, add initial documentation 2017-05-01 08:56:18 -06:00
Anthony Shaw
4fce227190
update the tutorials and docs 2017-04-30 20:32:44 +10:00
Anthony Shaw
e92a7ba660 Merge branch 'develop' into libcloud_state 2017-04-29 07:43:28 +10: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
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
Anthony Shaw
11907ae3b2 Update libcloud.rst 2017-04-28 19:01:21 +10: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
rallytime
a876bcdb8a Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-27 10:37:05 -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
Super-User
db6eadd6c3 update oxygen release notes for grains deprecation 2017-04-26 23:30:53 +02:00
Anthony Shaw
e2dc7bf141
format rst in tutorial 2017-04-27 06:32:25 +10:00
Mike Place
7a63e3cfd2 Merge pull request #40668 from grep4linux/new_xen_cloud_driver 
new Xen cloud driver
 2017-04-26 10:59:38 -06:00
rallytime
e2aa5e2f21 Add fingerprint_hash_type default value change to release notes 2017-04-26 10:47:28 -06:00
Anthony Shaw
f983d7e07b
enable load balancer to support extended arguments in create and destroy balancer 2017-04-26 21:10:43 +10:00
Anthony Shaw
e384754cb3
tutorial for the libcloud modules 2017-04-26 15:09:08 +10: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
rallytime
d7831c451c Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-25 11:09:01 -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
Erik Johnson
0e229a1910 Add note about moby naming to Nitrogen release notes 2017-04-23 23:34:58 -05:00
Mike Place
b5179aa873 Merge pull request #40778 from rallytime/oxygen-deprecations 
Start removing deprecated code for Oxygen release
 2017-04-23 04:30:51 -06:00
Ch3LL
704048be30
add spaces for code in docs 2017-04-21 16:10:31 -04:00
Ch3LL
09f7b3a500
add title 2017-04-21 16:08:52 -04:00
Ch3LL
f0ff969c6a
add ability to expand disk size on creation of vm in nebula 2017-04-21 16:05:18 -04:00
Daniel Wallace
559aa1d8b6 remove deprecated firstgen rackspace cloud driver 2017-04-21 08:59:56 -06:00
rallytime
55c947adf4 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-20 13:44:37 -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
e9f1d998cb Remove support for various deprecated state functions and kwargs 
- salt/states/archive.py
- salt/states/cmd.py
- salt/states/file.py
- All changes were documented in the oxygen release notes
 2017-04-19 14:35:04 -06:00
rallytime
59398f658e Remove support for deprecated win_* execution modules 
- Removed win_psget.psversion function
- Removed win_service.config function
- Removed support for various kwargs in the win_service.create function
- Updated Oxygen release notes with all changes
 2017-04-19 14:35:04 -06:00
rallytime
d9986185cf Remove support for deprecated "requests_lib" option 
Use "backend" instead.
 2017-04-19 14:35:04 -06:00
rallytime
0616405104 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-18 16:43:11 -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
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
rallytime
5282ea2480 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-13 09:46:05 -06:00
Raine Curtis
87035e0651 new Xen cloud driver 2017-04-12 14:52:07 -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
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
Mike Place
b2870cd4c2 Merge pull request #40613 from Venafi/develop 
Updated documentation for Venafi module with better examples & clarif…
 2017-04-11 08:48:35 -06:00
Mike Place
4d24fc2666 Merge pull request #40617 from rallytime/oxygen-release-notes 
Start release notes file for Oxygen
 2017-04-11 08:47:39 -06:00
rallytime
5acaee2d5d Start release notes for Oxygen 2017-04-10 16:44:58 -06:00
Mike Place
c56247c105 Merge pull request #40608 from pcn/patch-1 
Fix confusing typo in thorium start page
 2017-04-10 16:24:48 -06:00
wgoulet
bbac469cdb Updated documentation for Venafi module with better examples & clarifications 2017-04-10 15:41:24 -05: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
Nicole Thomas
93818257cb Merge pull request #40591 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-10 12:07:16 -06:00
Peter N
df9b061a33 Fix confusing typo in thorium start page 
The thorium auto deregistration example has a slightly confusing typo.  From my read of the docs it should `s/startreg/statreg` so I'm submitting this PR to make that effective.
 2017-04-10 10:54:26 -04:00
rallytime
4a75675d07 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
 2017-04-07 11:20:51 -06:00
Mike Place
fa2c8f852a Merge pull request #40557 from isbm/isbm-aws-doc-fix 
Fix the documentation for AWS
 2017-04-06 12:25:54 -06:00
Joseph Hall
08d071bc68 Update Azure ARM docs 2017-04-06 09:43:19 -06:00
Bo Maryniuk
99b7996ce6 Fix the documentation for AWS 2017-04-06 15:02:17 +02: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
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
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
Denis Fondras
a58e320f41 Set True instead of 1 2017-04-04 14:50:03 +02: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
ae43cb69e9 Merge pull request #40458 from cloudflare/napalm-syslog 
New engine: Napalm syslog
 2017-04-03 16:27:10 -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
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
0e03c9ba14 Add nitrogen release note for napalm-yang 2017-04-01 02:48:09 +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
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
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
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
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
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
Mike Place
b6032215e9 Merge pull request #40299 from amendlik/saltify-authtest 
Saltify authtest
 2017-03-28 10:17:02 -06:00
Nicole Thomas
863a9b96fb Merge pull request #40302 from cloudflare/nitorgen-doc 
Add NAPALM section in Nitrogen release notes
 2017-03-27 20:45:46 -06:00
Adam Mendlik
f1c5991971 Add documentation for saltify credential verification mode 2017-03-27 18:41:38 -06:00
Mike Place
3ee5894b9c Merge pull request #40292 from tgoodlet/qcow_docs 
Document qcow support
 2017-03-27 17:27:14 -06:00
Mike Place
338148de2c Cleaned up language slightly 2017-03-27 17:26:58 -06:00
Mike Place
15808b083f Tiny grammar fix 2017-03-27 17:25:31 -06:00
Mike Place
02cc480a2a Merge pull request #40330 from techhat/mapdata 
Pass in direct map_data instead of path to map
 2017-03-27 17:12:49 -06:00
Nicole Thomas
284d3be943 Merge pull request #40304 from vquiering/logstash_engine_add_protocol 
Add ip protocol to logstash engine
 2017-03-27 08:51:29 -06:00
Joseph Hall
5940679658 Fix function name 2017-03-27 08:25:38 -06:00
Joseph Hall
18ee1d1443 Update documentation for maps 2017-03-27 08:19:04 -06:00
Nicole Thomas
0031a61f80 Merge pull request #40286 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-24 16:09:47 -06:00
rallytime
5363e0b58b Update minion data cache documentation 
Updats the existing documentation and also adds more documentation
to the Multi-Master and Syndic topology files about the addition
of the pluggable minion data store.
 2017-03-24 14:25:46 -06:00
David Boucha
3ba50d3c52 add info about what is cached 2017-03-24 11:49:26 -06:00
David Boucha
77e8f6aff9 fix config example 2017-03-24 11:49:26 -06:00
David Boucha
61f2fa9339 Add documentation for the Minion data cache 
Includes docs for localfs and consul minion data cache modules
 2017-03-24 11:49:26 -06:00
Vitali Quiering
250a0b5ab4 Add logstash engine protocol to engines doc 2017-03-24 17:01:38 +01:00
Mircea Ulinic
07a8645611 Add NAPALM section in Nitrogen release notes 2017-03-24 13:22:38 +00:00
Tyler Goodlet
8bfa8e0d15 Document qcow support 2017-03-23 23:36:32 -04:00
Mircea Ulinic
14923b6fde Adding proxy module changes under Nitrogen release notes 2017-03-24 01:55:48 +00:00
Mircea Ulinic
a0a2f60961 Note proxy_merge_grains_in_module 2017-03-24 01:55:48 +00:00
Mircea Ulinic
5919d612b2 Adding Nitrogen notes to the proxy topic 2017-03-24 01:55:48 +00:00
Mircea Ulinic
01e9de2d04 Add proxy to index 2017-03-24 01:55:48 +00:00
rallytime
dbf74330ec Merge branch '2016.11' into 'develop' 
Conflicts:
  - pkg/windows/req_base.txt
  - salt/modules/ssh.py
 2017-03-23 16:40:44 -06:00
Ronald van Zantvoort
9aaeabd415 cache roster: Add Salt SDB support 2017-03-23 23:03:45 +01:00
Mike Place
e462a04d70 Merge pull request #40200 from DSRCorporation/features/zh864_auth_redesign 
E-Auth refactoring
 2017-03-23 13:32:20 -06:00
rallytime
235a768872 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/returners/influxdb_return.py
  - salt/states/dockerng.py
  - salt/utils/schedule.py
  - tests/unit/modules/test_docker.py
  - tests/unit/states/dockerng_test.py
  - tests/unit/utils/test_schedule.py
 2017-03-22 17:44:08 -06:00
rallytime
5c5b74b09a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - pkg/windows/req.txt
 2017-03-22 17:20:58 -06:00
rallytime
2ead188b4f Update release notes for 2016.3.6 2017-03-22 14:21:29 -06:00
Mike Place
54a9796f39 Merge pull request #40060 from techhat/venafi 
Add Venafi support
 2017-03-22 13:19:15 -06:00
Dmitry Kuzmenko
f3a970eec1 Added release notes. 2017-03-22 19:15:21 +03:00
Erik Johnson
b77f5b9630 Add warning about possible replaced containers on first run after upgrade 2017-03-22 09:19:20 -05:00
Erik Johnson
5ad476936d Overhaul Docker support 
This does the following:

- Splits states for container/volume/image/network management into four
  separate state modules.

- Preserves backward compatibility by making ``docker.image_present``
  invoke ``docker_image.present``, etc.

- Changes how Salt detects that a container needs to be replaced.
  Instead of comparing each passed argument to the named container's
  configuration, it creates a temporary container, and compares that
  container to the named container. If the two differ, then the older
  container is removed, and the new one is renamed and started, becoming
  the named container.

- Removes the unit tests for container management and replaces them with
  integration tests.

- Adds unit tests for the new salt.utils.docker
 2017-03-21 16:53:19 -05:00
Nicole Thomas
c284a82dfa Merge pull request #40032 from tgoodlet/virt_fixups 
Some random salt-virt bug fixes and docs fixups
 2017-03-21 10:32:42 -06:00
rallytime
a55c4138a8 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-03-21 10:13:56 -06:00
Joseph Hall
7e48e5da05 Address comments from @cro 2017-03-21 10:05:27 -06:00
Walter Goulet
bdd18d874d Added support for generating key based on configured policy and to use updated flattened APIs 2017-03-21 09:47:28 -06:00
Mike Place
3370d2de7c Merge pull request #39891 from isbm/isbm-translate-varargs 
Introduce "module.xrun"
 2017-03-21 09:23:28 -06:00
Erik Johnson
a42be82993 Link to minion start reactor example from FAQ. 
This provides a natural solution to the chicken-and-egg problem
identified in the FAQ. It also changes the name of the event in the
reactor example, as I think we may have stopped sending the legacy
(i.e. not-namespaced) events, so the "minion_start" event in the example
would be incorrect.
 2017-03-21 10:01:20 -05:00
Ch3LL
9c6d8d892f additional PRs/issues for 2016.3.6 release notes 2017-03-20 15:45:29 -06:00
Bo Maryniuk
3ba87e495b Release note fix 2017-03-20 22:31:54 +01:00
Bo Maryniuk
18d85b1ab8 Fix docstring to the new opt-in deprecation policy 2017-03-20 22:31:54 +01:00
Bo Maryniuk
6579f113d2 Fix release notes 2017-03-20 22:31:53 +01:00
Bo Maryniuk
b6c513e458 Add newlines for markdown 2017-03-20 22:31:53 +01:00
Bo Maryniuk
ffa7035558 Add the option to the Nitrogen Release Notes 2017-03-20 22:31:53 +01:00
Seth House
7ccaf1c9dd Add note about the jobs runner to the external job cache docs 2017-03-20 13:40:14 -06:00
rallytime
caebd5d8cf Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/targeting/nodegroups.rst
  - salt/runners/manage.py
 2017-03-16 17:23:57 -06:00
rallytime
626bd03885 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/runners/manage.py
 2017-03-16 10:43:18 -06:00
Ch3LL
a1f8b49bd1 update 2016.3.6 release notes with additional PR's 2017-03-15 16:34:17 -06:00
rallytime
148df32604 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-03-15 14:52:07 -06:00
Joseph Hall
55adc635b9 Remove obvious depends from the docs 2017-03-15 14:51:48 -06:00
Joseph Hall
be33cd8146 Add Venafi support 2017-03-15 14:50:07 -06:00
rallytime
72d16c9fa9 Update "yaml" code-block references with "jinja" where needed 
There are many `.. code-block: yaml` definitions that should really
be `.. code-block: jinja` definitions. This commit cleans up some
of those and removes warnings like these from the doc build:

```
WARNING: Could not lex literal_block as "yaml". Highlighting skipped.
```
 2017-03-15 10:22:19 -06:00
Tyler Goodlet
466e96c99b Fixup and add more details to virt docs 
`virt.hyper_info` no longer exists; switch to `virt.host_info`.
Document `virt.list` for listing all machines on all hypervisors.
Add more details regarding how images are copied to hypervisor minions
and cloned locally before configuration, seeding and boot.
 2017-03-15 02:37:03 -04:00
Tyler Goodlet
fafa94daeb Fix docs bug about VNC consoles being created by default 2017-03-15 02:37:03 -04:00
rallytime
029f28bbd5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/cmdmod.py
 2017-03-14 15:44:38 -06:00
rallytime
4b0bdc9ce0 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/s3.py
 2017-03-14 15:39:51 -06:00
Mike Place
60066da614 Merge pull request #39924 from dmurphy18/salt_aix_fixMar 
Add AIX support for user and group execution modules
 2017-03-14 15:04:01 -06:00
Ch3LL
f3e7e4fb2a Add 2016.3.6 Release Notes 2017-03-14 13:39:48 -06:00
Joseph Hall
dde48b3650 Add event_filter to salt cloud 2017-03-13 15:36:13 -06:00
Mike Place
af242e1c51 Merge pull request #39864 from rallytime/remove-26-requirements 
Remove the dev_python26.txt install file
 2017-03-10 20:51:24 -07:00
Mike Place
4d5adadebd Merge pull request #39966 from techhat/armcache 
Update Azure ARM cache
 2017-03-10 20:35:04 -07:00
rallytime
9ddf032e8e Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/beacons/status.py
  - salt/modules/saltutil.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_beacons.py
  - tests/unit/beacons/inotify_beacon_test.py
 2017-03-10 14:57:31 -07:00
Joseph Hall
44bb43825a Update Azure ARM cache 2017-03-10 14:15:12 -07:00
rallytime
c8b5d390b5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/minion.py
 2017-03-09 16:05:15 -07:00
David Murphy
5077c989bb Updated changes file for added AIX support 2017-03-09 09:38:35 -07:00
Ronald van Zantvoort
170cbadc54 CIDR matching supports IPv6, update docs 
After #22080 IPv6 CIDR matching is supported & functional, docs should('ve) reflected that since 2015.8
 2017-03-09 13:52:13 +01:00
rallytime
4fc9b5484b Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/pillar/makostack.py
  - tests/integration/client/test_runner.py
  - tests/integration/states/test_file.py
 2017-03-08 09:04:26 -07:00
Joseph Hall
35440c5936 Add installation tips for azure 2017-03-07 12:12:56 -07:00
Joseph Hall
2a1ae0bf2e Change example master in azure docs 2017-03-07 10:01:09 -07:00
Mike Place
da164bfc22 Minor grammar cleanup 2017-03-07 08:51:29 -07:00
Ronald van Zantvoort
7cd3ac4e78 Cache roster: add release notes 2017-03-07 12:10:34 +01:00
rallytime
2193cee012 Remove the dev_python26.txt install file 
Since we're moving to support Python 2.7 and 3.4 in Nitrogen,
we shouldn't need the 2.6 requirements file any longer.

Also updates the doc instructions to use the dev_python34 file
instead of dev_python26, depending on your Python version.
 2017-03-06 23:02:17 -07:00
Nicole Thomas
76adf65880 Merge pull request #39853 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-06 11:44:38 -07:00
rallytime
a3fe63f972 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-03-06 09:12:01 -07:00
Mike Place
4002dc1947 Merge pull request #39819 from terminalmage/top-file-matching-docs 
Improve the Top File matching docs
 2017-03-04 09:06:39 -07:00
Jan Kadlec
804b12048c Add missing apostrophe 2017-03-03 17:58:53 +01:00
Erik Johnson
7178e77eee Improve the Top File matching docs 
In 2014.7.0, default matcher in the top file was changed to the compound
matcher, but the docs still suggest that it is the glob matcher. This
commit updates the docs to explicitly mention that the compound matcher
is now the default, and adds a table describing all of the available
matchers that can be set in the top file.
 2017-03-03 10:40:22 -06:00
Mike Place
e48036a05d Merge pull request #39773 from twangboy/win_file_dacl 
Make win_file use the win_dacl salt util
 2017-03-02 09:24:50 -07:00
Mike Place
2d711782e8 Merge pull request #39736 from techhat/spmstates 
Add pre and post states to SPM
 2017-03-01 19:57:41 -07:00
twangboy
7ef41155c0 Make win_file use the win_dacl salt util 2017-03-01 17:57:23 -07:00
Mike Place
2484e52716 Merge pull request #39743 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-01 11:46:47 -07:00
Joseph Hall
255db60f5a Add pre and post states to SPM 2017-03-01 10:40:30 -07:00
Mike Place
4fc0451d64 Merge pull request #39702 from techhat/spmfiles 
Add files section to FORMULA files
 2017-03-01 10:18:30 -07:00
Ch3LL
1853c998c4 add initial 2016.11.4 release notes 2017-03-01 09:47:07 -07:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
rallytime
452822f5f7 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-02-28 17:14:40 -07:00
Denys Havrysh
1d86cf1161 DOCS: add 2nd level header for advanced targeting methods 2017-02-28 16:23:53 +02:00
Joseph Hall
ded8040b55 Update docs 2017-02-27 17:51:00 -07:00
rallytime
b4366103a6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - .pylintrc
  - .testing.pylintrc
  - salt/fileclient.py
  - salt/minion.py
  - salt/modules/docker.py
  - salt/modules/win_iis.py
  - salt/states/docker.py
  - salt/states/file.py
  - salt/utils/__init__.py
  - tests/integration/modules/test_sysmod.py
 2017-02-27 15:11:37 -07:00
Mike Place
e540b4616e
Update Solaris installation document 
The OpenCSW packages are no longer maintained. Include details about
installing via setup.py.
 2017-02-25 19:24:02 -07:00