valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
89,004 Commits 24 Branches 182 Tags 341 MiB
aec551540a
Commit Graph

4929 Commits

Author SHA1 Message Date
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
twangboy
5a5d70866a Change repo_ng to repo-ng 2017-07-03 14:15:35 -06:00
rallytime
9227a1263d Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-06-30 10:00:01 -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
Erik Johnson
9a50e7c1ca Merge remote-tracking branch 'upstream/2017.7' into merge-develop 2017-06-28 22:10:50 -05:00
rallytime
e512a29f08 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/state.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - salt/version.py
  - tests/unit/config/test_config.py
  - tests/unit/modules/test_zypper.py
 2017-06-28 11:31:53 -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
Bo Maryniuk
c2b5e50d50 Add missing doc info for pressrelease 2017-06-26 14:38:19 +02:00
garethgreenaway
bd3ed3a7c5 Merge branch 'develop' into patch-1 2017-06-22 12:00:30 -07:00
Mike Place
c89cd2a4bf Merge pull request #41890 from cachedout/locale_doc 
Locale doc
 2017-06-22 12:34:46 -05:00
Mike Place
fb008e6f84 Merge pull request #41144 from terminalmage/issue34775 
gitfs: Add two new options to affect saltenv mapping
 2017-06-22 12:05:49 -05:00
garethgreenaway
5709cbbde5 Merge branch 'develop' into patch-1 2017-06-22 09:34:39 -07: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
Arno Schuring
e9d381ae6b Merge branch 'develop' into execution-module-docs 2017-06-22 13:45:05 +02:00
Yagnik
2f32db6d7b Update documentation of beacons 
Update beacons documentation to let the user know that beacons can also be set in pillars like other configs.
 2017-06-22 10:10:42 +05:30
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
Erik Johnson
1279f56c56 gitfs: Add two new options to affect saltenv mapping 
This adds 2 new config options:

- gitfs_disable_saltenv_mapping - This allows a user to disable the environment mapping logic and rely solely on per-saltenv configuration
- gitfs_ref_types - This allows individual ref types to be ignored

It also includes a performance improvement in retrieving tree objects
matching the desired ref name. Before, we would iterate through the
different refs and check if the name matched the desired ref's name.
Now we just check for a head/tag ref based on the ref path in the
gitdir (e.g. refs/remotes/origin/master or refs/tags/v1.2.3). This
prevents us from needlessly iterating through all refs until a match is
found, which does not scale well when the number of branches and tags is
larger.
 2017-06-21 12:42:48 -05:00
Erik Johnson
63823f3436 Do not merge master_tops and top file matches using set union 
The code which integrates master_tops SLS matches with top file SLS
matches was using set operations to ensure there were no duplicate
matches. However, the process of first converting the matches to a set,
and then performing a union on the two sets, has the side effect of
making the ordering unpredictable.

The set operations have been removed in favor of list comprehensions.
This ensures that the ordering is predictable, and that master_tops
matches are executed *after* top file matches.

In addition, a new minion config option called "master_tops_first" has
been added to allow for the master_tops matches to be executed *before*
top file matches.
 2017-06-20 15:04:34 -05: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
rallytime
add5b118a3 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/yumpkg.py
  - tests/unit/templates/test_jinja.py
 2017-06-19 14:12:36 -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
Alexandru Bleotu
e42d1172a8 Added Tests section in JINJA documentation 2017-06-19 17:15:23 +01: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
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
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
Mike Place
9c45fa044d Merge pull request #41748 from terminalmage/issue3415 
Add comparison operator support for package installation in yum/dnf and apt
 2017-06-15 15:32:37 -05:00
rallytime
7fef4cf38f Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
 2017-06-15 10:57:27 -06:00
twangboy
b6201bac33 Fix version numbers 2017-06-15 09:53:57 -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
b0556bd58b Merge branch 'develop' into issue3415 2017-06-15 10:09:46 -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
Ch3LL
fa368f21ac
Add Change Log to 2016.11.6 Release Notes 2017-06-14 16:00:50 -04:00
rallytime
d7ecd3c149 Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-06-14 13:35:50 -06: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
Erik Johnson
f1d7eb4166 Add comparison operator feature to Oxygen release notes 2017-06-14 13:47:49 -05: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
74d9a36d5a Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - pkg/salt-proxy@.service
  - salt/modules/npm.py
  - salt/modules/parted.py
  - tests/integration/modules/test_libcloud_dns.py
 2017-06-13 15:01:51 -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
Vasili Syrakis
4fbcc3b318 Added documentation for the annotation 2017-06-09 00:25:10 +10:00
Arno schuring
85f520467a
Update modules doc 
Reword the description of the __virtual__() function, to clarify why
__salt__ should not be relied upon. In response to #41628
 2017-06-08 13:45:14 +02:00
Mike Place
b7fcf9c0da Merge pull request #41636 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-06-07 12:42:04 -05:00
rallytime
396b06fdf8 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-06-07 09:54:20 -06:00
rajvidhimar
0fd3344a65 Update network_automation doc 2017-06-07 14:04:58 +05:30
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
rajvidhimar
e92b110a1c Junos specific documentation for topic Network Automation 2017-06-05 16:03:30 +05:30
Ric Klaren
aa88749a71 Add flag to disable validation when cloning a libvirt domain 
Provide workaround for issue #41137
 2017-06-01 23:14:15 +02:00
Mircea Ulinic
fb12353a1d Insert note in the Nitrogen release 2017-06-01 11:42:53 +00:00
rallytime
8c1dc36a8b Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/modules/zypper.py
  - salt/utils/parsers.py
 2017-05-30 10:20:44 -06: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
ff417db115 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - doc/topics/venafi/index.rst
  - pkg/salt-proxy@.service
  - salt/config/__init__.py
 2017-05-26 11:27:24 -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
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
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
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
rallytime
718b0adc70 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/modules/zypper.py
  - tests/unit/utils/test_network.py
 2017-05-23 09:05:13 -06: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
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
Mike Place
8386d10b4b Merge pull request #41192 from DSRCorporation/features/executors_redesign_doc 
Executors redesign and documentation
 2017-05-18 10:42:20 -05:00
Mike Place
1c3741eae1 Merge pull request #41284 from shengis/azurerm_load_balancers 
Add support for load balancers with AzureARM provider
 2017-05-17 13:24:58 -05:00
Aurélien FUSIL-DELAHAYE
f7252151a1 Add support for availibility_set 
documentation added
 2017-05-17 11:50:31 +02:00
Aurelien Fusil-Delahaye
495e848dad Documentation for load-balancer 2017-05-16 23:22:40 +02:00
Dmitry Kuzmenko
7a8b644da7 Executors documentation. 2017-05-15 11:41:00 +03:00
Evgeny Akhmetkhanov
76104f23b4 Add basic auth for SPM 2017-05-14 15:32:55 +03:00
rallytime
d75a7e0d0f Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-12 16:42:54 -06:00
Mike Place
8028b9f00f Merge pull request #41182 from amendlik/win-authtest 
Saltify credendial verification for Windows
 2017-05-12 12:05:07 -05: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
Mike Place
8dab7390e6 Merge pull request #41201 from rallytime/remove-blockdev-module 
Remove blockdev execution module
 2017-05-12 11:09:21 -05:00
rallytime
d510583bb5 Remove blockdev execution module 
All of the functions in the blockdev execution module have been
moved over to the disk execution module. These functions were
slated for removal in the Oxygen release.
 2017-05-11 14:13:42 -06:00
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