Commit graph

7817 commits

Author SHA1 Message Date
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
Aneesh Agrawal
1f82f90fc9 Document returning False in test=True mode
Currently, in test mode states always return None even on failure.
This masks failed states in highstate output,
which instead just look like they are going to make changes.

In some cases states can determine if they will fail even on a dry run,
e.g., if an API call to a service to determine the state of a
resource fails due to invalid credentials or a missing parameter.

In these cases, allow returning a result of False even in dry runs
to enable catching more errors at testing time.
2017-07-26 22:00:16 +00: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
rallytime
685c2cced6 Add information about returning a tuple with an error message 2017-07-25 14:44:18 -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
fa466519c4 Add a mention of the True/False returns with __virtual__()
And their relationship to `__virtualname__`.

Fixes #42375
2017-07-24 13:58:16 -06: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
c91a5e539e Merge pull request #42425 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-07-21 16:43: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
Ch3LL
c10196f68c update windows urls to new py2/py3 naming scheme 2017-07-21 11:22:57 -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
Ch3LL
3f4a918f73 update windows urls to new py2/py3 naming scheme 2017-07-21 09:45:30 -04: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
rallytime
c673b64583 Merge branch '2016.11' into '2017.7'
Conflicts:
  - doc/conf.py
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/engines/hipchat.py
  - salt/engines/slack.py
  - salt/grains/core.py
  - salt/version.py
  - tests/integration/states/test_renderers.py
2017-07-20 09:54:08 -06: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
letsmakesense
b234f80308 state_top value also affects pillar top file
Hi,
thanks for making Saltstack. It's terrific. 
When I was looking for an option to change the name of the pillar top file I couldn't find anything, but I found out that 'state_top' also affects the name of pillar top file. My change tries to make this behaviour explicit.
Greetings,
Peter
2017-07-19 11:29:18 +02: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
3e39526009 Merge pull request #42358 from Ch3LL/doc-update-develop
[develop] Update version numbers in doc config for 2017.7.0 release
2017-07-18 13:23:46 -06:00
Nicole Thomas
f06a6f1796 Merge pull request #42360 from Ch3LL/doc-update-2016.11
[2016.11] Update version numbers in doc config for 2017.7.0 release
2017-07-18 13:23:29 -06:00
Nicole Thomas
4dfe50e558 Merge pull request #42361 from Ch3LL/doc-update-2017.7
[2017.7] Update version numbers in doc config for 2017.7.0 release
2017-07-18 13:23:22 -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
e0595b0a0f Merge pull request #42319 from rallytime/config-docs
Add more documentation for config options that are missing from master/minion docs
2017-07-18 12:02:31 -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
Ch3LL
0f48ee8a35 [develop] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:58:03 -04:00