Merge branch 'develop' into fix_requests_ssl_verify_error

.codeclimate.yml

@@ -1,5 +1,13 @@
 languages:
-   Ruby: false
-   JavaScript: false
-   Python: true
-   PHP: false
+  Ruby: false
+  JavaScript: false
+  Python: true
+  PHP: false
+
+engines:
+  radon:
+    enabled: true
+    exclude_paths:
+      - "templates/"
+    config:
+      threshold: "D"

.github/CODEOWNERS

@@ -0,0 +1,60 @@
+# SALTSTACK CODE OWNERS
+
+# See https://help.github.com/articles/about-codeowners/
+# for more info about CODEOWNERS file
+
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+# See https://help.github.com/articles/about-codeowners/
+# for more info about the CODEOWNERS file
+
+# Team Boto
+salt/**/*boto*                      @saltstack/team-boto
+
+# Team Core
+salt/auth/                          @saltstack/team-core
+salt/cache/                         @saltstack/team-core
+salt/cli/                           @saltstack/team-core
+salt/client/*                       @saltstack/team-core
+salt/config/*                       @saltstack/team-core
+salt/daemons/                       @saltstack/team-core
+salt/pillar/                        @saltstack/team-core
+salt/loader.py                      @saltstack/team-core
+salt/payload.py                     @saltstack/team-core
+salt/**/master*                     @saltstack/team-core
+salt/**/minion*                     @saltstack/team-core
+
+# Team Cloud
+salt/cloud/                         @saltstack/team-cloud
+salt/utils/openstack/               @saltstack/team-cloud
+salt/utils/aws.py                   @saltstack/team-cloud
+salt/**/*cloud*                     @saltstack/team-cloud
+
+# Team NetAPI
+salt/cli/api.py                     @saltstack/team-netapi
+salt/client/netapi.py               @saltstack/team-netapi
+salt/netapi/                        @saltstack/team-netapi
+
+# Team Network
+salt/proxy/                         @saltstack/team-proxy
+
+# Team SPM
+salt/cli/spm.py                     @saltstack/team-spm
+salt/spm/                           @saltstack/team-spm
+
+# Team SSH
+salt/cli/ssh.py                     @saltstack/team-ssh
+salt/client/ssh/                    @saltstack/team-ssh
+salt/runners/ssh.py                 @saltstack/team-ssh
+salt/**/thin.py                     @saltstack/team-ssh
+
+# Team State
+salt/state.py                       @saltstack/team-state
+
+# Team Transport
+salt/transport/                     @saltstack/team-transport
+salt/utils/zeromq.py                @saltstack/team-transport
+
+# Team Windows
+salt/**/*win*                       @saltstack/team-windows

.github/stale.yml

@@ -0,0 +1,33 @@
+# Probot Stale configuration file
+
+# Number of days of inactivity before an issue becomes stale
+# 950 is approximately 2 years and 7 months
+daysUntilStale: 950
+
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+
+# Issues with these labels will never be considered stale
+#exemptLabels:
+#  - pinned
+#  - security
+
+# Label to use when marking an issue as stale
+staleLabel: stale
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: |
+  This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.
+
+  If this issue is closed prematurely, please leave a comment and we will gladly reopen the issue.
+
+# Comment to post when removing the stale label. Set to `false` to disable
+unmarkComment: |
+  Thank you for updating this issue. It is no longer marked as stale.
+
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
+
+# Limit to only `issues` or `pulls`
+only: issues
+

.gitignore

@@ -88,3 +88,6 @@ tests/integration/cloud/providers/logs
 
 # Private keys from the integration tests
 tests/integration/cloud/providers/pki/minions
+
+# Ignore tox virtualenvs
+/.tox/

.mention-bot

@@ -1,5 +1,17 @@
 {
+  "alwaysNotifyForPaths": [
+    {
+      "name": "ryan-lane",
+      "files": ["salt/**/*boto*.py"],
+      "skipTeamPrs": false
+    },
+    {
+      "name": "tkwilliams",
+      "files": ["salt/**/*boto*.py"],
+      "skipTeamPrs": false
+    }
+  ],
  "skipTitle": "Merge forward",
- "userBlacklist": ["cvrebert", "markusgattol", "olliewalsh"]
+ "userBlacklist": ["cvrebert", "markusgattol", "olliewalsh", "basepi"]
 }
 

.pylintrc

@@ -258,8 +258,8 @@ ignore-imports=no
 
 
 [BASIC]
-# Required attributes for module, separated by a comma
-required-attributes=
+# Required attributes for module, separated by a comma (will be removed in Pylint 2.0)
+#required-attributes=
 
 # List of builtins function names that should not be used, separated by a comma
 bad-functions=map,filter,apply,input
@@ -365,7 +365,8 @@ spelling-store-unknown-words=no
 [CLASSES]
 # List of interface methods to ignore, separated by a comma. This is used for
 # instance to not check methods defines in Zope's Interface base class.
-ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
+# Will be removed in Pylint 2.0
+#ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
 
 # List of method names used to declare (i.e. assign) instance attributes.
 defining-attr-methods=__init__,__new__,setUp

README.rst

@@ -67,10 +67,11 @@ Engage SaltStack
 
 `SaltConf`_, **User Groups and Meetups** - SaltStack has a vibrant and `global
 community`_ of customers, users, developers and enthusiasts. Connect with other
-Salted folks in your area of the world, or join `SaltConf16`_, the SaltStack
-annual user conference, April 19-21 in Salt Lake City. Please let us know if
-you would like to start a user group or if we should add your existing
-SaltStack user group to this list by emailing: info@saltstack.com
+Salted folks in your area of the world, or join `SaltConf`_, the SaltStack
+annual user conference held in Salt Lake City. Please visit the `SaltConf`_ site
+for details of our next conference. Also, please let us know if you would like
+to start a user group or if we should add your existing SaltStack user group to
+this list by emailing: info@saltstack.com
 
 **SaltStack Training** - Get access to proprietary `SaltStack education
 offerings`_ through instructor-led training offered on-site, virtually or at
@@ -89,9 +90,8 @@ services`_ offerings.
 * LinkedIn Group - `<https://www.linkedin.com/groups/4877160>`_
 * Google+ - `<https://plus.google.com/b/112856352920437801867/+SaltStackInc/posts>`_
 
-.. _SaltConf: http://www.youtube.com/user/saltstack
 .. _global community: http://www.meetup.com/pro/saltstack/
-.. _SaltConf16: http://saltconf.com/
+.. _SaltConf: http://saltconf.com/
 .. _SaltStack education offerings: http://saltstack.com/training/
 .. _SaltStack Certified Engineer (SSCE): http://saltstack.com/certification/
 .. _SaltStack professional services: http://saltstack.com/services/

conf/cloud

@@ -97,3 +97,14 @@
 #
 #delete_sshkeys: False
 
+# Whether or not to include grains information in the /etc/salt/minion file
+# which is generated when the minion is provisioned.  For example...
+#   grains:
+#     salt-cloud:
+#       driver: ec2
+#       provider: my_ec2:ec2
+#       profile: micro_ec2
+#
+# Default: 'True'
+#
+#enable_cloud_grains: 'True'

conf/cloud.providers

@@ -3,7 +3,7 @@
 # directory is identical.
 
 #my-digitalocean-config:
-#  driver: digital_ocean
+#  driver: digitalocean
 #  client_key: wFGEwgregeqw3435gDger
 #  api_key: GDE43t43REGTrkilg43934t34qT43t4dgegerGEgg
 #  location: New York 1

conf/cloud.providers.d/digitalocean.conf

@@ -1,5 +1,5 @@
 #my-digitalocean-config:
-#  driver: digital_ocean
+#  driver: digitalocean
 #  client_key: wFGEwgregeqw3435gDger
 #  api_key: GDE43t43REGTrkilg43934t34qT43t4dgegerGEgg
 #  location: New York 1

conf/master

@@ -288,9 +288,34 @@
 # a value for you. Default is disabled.
 # ipc_write_buffer: 'dynamic'
 
+# These two batch settings, batch_safe_limit and batch_safe_size, are used to
+# automatically switch to a batch mode execution. If a command would have been
+# sent to more than <batch_safe_limit> minions, then run the command in
+# batches of <batch_safe_size>. If no batch_safe_size is specified, a default
+# of 8 will be used. If no batch_safe_limit is specified, then no automatic
+# batching will occur.
+#batch_safe_limit: 100
+#batch_safe_size: 8
+
 
 #####        Security settings       #####
 ##########################################
+# Enable passphrase protection of Master private key.  Although a string value
+# is acceptable; passwords should be stored in an external vaulting mechanism
+# and retrieved via sdb. See https://docs.saltstack.com/en/latest/topics/sdb/.
+# Passphrase protection is off by default but an example of an sdb profile and
+# query is as follows.
+# masterkeyring:
+#  driver: keyring
+#  service: system
+#
+# key_pass: sdb://masterkeyring/key_pass
+
+# Enable passphrase protection of the Master signing_key. This only applies if
+# master_sign_pubkey is set to True.  This is disabled by default.
+# master_sign_pubkey: True
+# signing_key_pass: sdb://masterkeyring/signing_pass
+
 # Enable "open mode", this mode still maintains encryption, but turns off
 # authentication, this is only intended for highly secure environments or for
 # the situation where your keys end up in a bad state. If you run in open mode
@@ -439,11 +464,13 @@
 
 #####     Salt-SSH Configuration     #####
 ##########################################
+# Define the default salt-ssh roster module to use
+#roster: flat
 
-# Pass in an alternative location for the salt-ssh roster file
+# Pass in an alternative location for the salt-ssh `flat` roster file
 #roster_file: /etc/salt/roster
 
-# Define locations for roster files so they can be chosen when using Salt API.
+# Define locations for `flat` roster files so they can be chosen when using Salt API.
 # An administrator can place roster files into these locations. Then when
 # calling Salt API, parameter 'roster_file' should contain a relative path to
 # these locations. That is, "roster_file=/foo/roster" will be resolved as
@@ -507,6 +534,9 @@
 # Add any additional locations to look for master runners:
 #runner_dirs: []
 
+# Add any additional locations to look for master utils:
+#utils_dirs: []
+
 # Enable Cython for master side modules:
 #cython_enable: False
 
@@ -561,11 +591,12 @@
 # all data that has a result of True and no changes will be suppressed.
 #state_verbose: True
 
-# The state_output setting changes if the output is the full multi line
-# output for each changed state if set to 'full', but if set to 'terse'
-# the output will be shortened to a single line.  If set to 'mixed', the output
-# will be terse unless a state failed, in which case that output will be full.
-# If set to 'changes', the output will be full unless the state didn't change.
+# The state_output setting controls which results will be output full multi line
+# full, terse - each state will be full/terse
+# mixed - only states with errors will be full
+# changes - states with changes and errors will be full
+# full_id, mixed_id, changes_id and terse_id are also allowed;
+# when set, the state ID will be used as name in the output
 #state_output: full
 
 # The state_output_diff setting changes whether or not the output from
@@ -942,7 +973,7 @@
 #pillar_cache_ttl: 3600
 
 # If and only if a master has set `pillar_cache: True`, one of several storage providers
-# can be utililzed.
+# can be utilized.
 #
 # `disk`: The default storage backend. This caches rendered pillars to the master cache.
 #         Rendered pillars are serialized and deserialized as msgpack structures for speed.

conf/minion

@@ -373,7 +373,7 @@
 #    interface: eth0
 #    cidr: '10.0.0.0/8'
 
-# The number of seconds a mine update runs.
+# The number of minutes between mine updates.
 #mine_interval: 60
 
 # Windows platforms lack posix IPC and must rely on slower TCP based inter-
@@ -635,9 +635,12 @@
 # all data that has a result of True and no changes will be suppressed.
 #state_verbose: True
 
-# The state_output setting changes if the output is the full multi line
-# output for each changed state if set to 'full', but if set to 'terse'
-# the output will be shortened to a single line.
+# The state_output setting controls which results will be output full multi line
+# full, terse - each state will be full/terse
+# mixed - only states with errors will be full
+# changes - states with changes and errors will be full
+# full_id, mixed_id, changes_id and terse_id are also allowed;
+# when set, the state ID will be used as name in the output
 #state_output: full
 
 # The state_output_diff setting changes whether or not the output from
@@ -689,6 +692,12 @@
 # for a full explanation.
 #multiprocessing: True
 
+# Limit the maximum amount of processes or threads created by salt-minion.
+# This is useful to avoid resource exhaustion in case the minion receives more
+# publications than it is able to handle, as it limits the number of spawned
+# processes or threads. -1 is the default and disables the limit.
+#process_count_max: -1
+
 
 #####         Logging settings       #####
 ##########################################

conf/proxy

@@ -498,9 +498,12 @@
 # all data that has a result of True and no changes will be suppressed.
 #state_verbose: True
 
-# The state_output setting changes if the output is the full multi line
-# output for each changed state if set to 'full', but if set to 'terse'
-# the output will be shortened to a single line.
+# The state_output setting controls which results will be output full multi line
+# full, terse - each state will be full/terse
+# mixed - only states with errors will be full
+# changes - states with changes and errors will be full
+# full_id, mixed_id, changes_id and terse_id are also allowed;
+# when set, the state ID will be used as name in the output
 #state_output: full
 
 # The state_output_diff setting changes whether or not the output from

conf/suse/master

@@ -438,11 +438,13 @@ syndic_user: salt
 
 #####     Salt-SSH Configuration     #####
 ##########################################
+# Define the default salt-ssh roster module to use
+#roster: flat
 
-# Pass in an alternative location for the salt-ssh roster file
+# Pass in an alternative location for the salt-ssh `flat` roster file
 #roster_file: /etc/salt/roster
 
-# Define locations for roster files so they can be chosen when using Salt API.
+# Define locations for `flat` roster files so they can be chosen when using Salt API.
 # An administrator can place roster files into these locations. Then when
 # calling Salt API, parameter 'roster_file' should contain a relative path to
 # these locations. That is, "roster_file=/foo/roster" will be resolved as
@@ -560,11 +562,12 @@ syndic_user: salt
 # all data that has a result of True and no changes will be suppressed.
 #state_verbose: True
 
-# The state_output setting changes if the output is the full multi line
-# output for each changed state if set to 'full', but if set to 'terse'
-# the output will be shortened to a single line.  If set to 'mixed', the output
-# will be terse unless a state failed, in which case that output will be full.
-# If set to 'changes', the output will be full unless the state didn't change.
+# The state_output setting controls which results will be output full multi line
+# full, terse - each state will be full/terse
+# mixed - only states with errors will be full
+# changes - states with changes and errors will be full
+# full_id, mixed_id, changes_id and terse_id are also allowed;
+# when set, the state ID will be used as name in the output
 #state_output: full
 
 # The state_output_diff setting changes whether or not the output from

doc/conf.py

@@ -245,8 +245,8 @@ on_saltstack = 'SALT_ON_SALTSTACK' in os.environ
 project = 'Salt'
 
 version = salt.version.__version__
-latest_release = '2017.7.1'  # latest release
-previous_release = '2016.11.7'  # latest release from previous branch
+latest_release = '2017.7.2'  # latest release
+previous_release = '2016.11.8'  # latest release from previous branch
 previous_release_dir = '2016.11'  # path on web server for previous branch
 next_release = ''  # next release
 next_release_dir = ''  # path on web server for next release branch
@@ -258,8 +258,8 @@ if on_saltstack:
     copyright = time.strftime("%Y")
 
 # < --- START do not merge these settings to other branches START ---> #
-build_type = 'latest'  # latest, previous, develop, next
-release = latest_release # version, latest_release, previous_release
+build_type = 'develop'  # latest, previous, develop, next
+release = version  # version, latest_release, previous_release
 # < --- END do not merge these settings to other branches END ---> #
 
 # Set google custom search engine
@@ -515,6 +515,7 @@ epub_copyright = copyright
 epub_scheme = 'URL'
 epub_identifier = 'http://saltstack.com/'
 
+epub_tocdup = False
 #epub_tocdepth = 3
 
 

doc/contents.rst

@@ -18,6 +18,7 @@ Salt Table of Contents
     topics/ssh/index
     topics/cloud/index
     topics/proxyminion/index
+    topics/network_automation/index
     topics/virt/index
     ref/cli/index
     ref/index

doc/faq.rst

@@ -325,7 +325,7 @@ The following example works on UNIX-like operating systems:
 
 .. code-block:: jinja
 
-    {%- if grains['os'] != 'Windows' %
+    {%- if grains['os'] != 'Windows' %}
     Restart Salt Minion:
       cmd.run:
         - name: 'salt-call --local service.restart salt-minion'

doc/man/salt.7

@@ -10795,6 +10795,7 @@ cmd_whitelist_glob:
 .UNINDENT
 .UNINDENT
 .SS Thread Settings
+.SS \fBmultiprocessing\fP
 .sp
 Default: \fBTrue\fP
 .sp
@@ -29817,7 +29818,7 @@ If the master seems to be unresponsive, a SIGUSR1 can be passed to the
 salt\-master threads to display what piece of code is executing. This debug
 information can be invaluable in tracking down bugs.
 .sp
-To pass a SIGUSR1 to the master, first make sure the minion is running in the
+To pass a SIGUSR1 to the master, first make sure the master is running in the
 foreground. Stop the service if it is running as a daemon, and start it in the
 foreground like so:
 .INDENT 0.0

doc/ref/auth/all/index.rst

@@ -19,5 +19,4 @@ auth modules
     pki
     rest
     sharedsecret
-    stormpath
     yubico

doc/ref/auth/all/salt.auth.file.rst

@@ -0,0 +1,6 @@
+==============
+salt.auth.file
+==============
+
+.. automodule:: salt.auth.file
+    :members:

doc/ref/auth/all/salt.auth.stormpath.rst

@@ -1,6 +0,0 @@
-===================
-salt.auth.stormpath
-===================
-
-.. automodule:: salt.auth.stormpath
-    :members:

doc/ref/beacons/all/index.rst

@@ -22,6 +22,7 @@ beacon modules
     load
     log
     memusage
+    napalm_beacon
     network_info
     network_settings
     pkg

doc/ref/beacons/all/salt.beacons.napalm_beacon.rst

@@ -0,0 +1,6 @@
+==========================
+salt.beacons.napalm_beacon
+==========================
+
+.. automodule:: salt.beacons.napalm_beacon
+    :members:

doc/ref/cache/all/salt.cache.etcd_cache.rst

@@ -0,0 +1,5 @@
+salt.cache.etcd_cache module
+=============================
+
+.. automodule:: salt.cache.etcd_cache
+    :members:

doc/ref/cache/all/salt.cache.mysql_cache.rst

@@ -0,0 +1,5 @@
+salt.cache.mysql_cache module
+=============================
+
+.. automodule:: salt.cache.mysql_cache
+    :members:

doc/ref/cli/salt-cloud.rst

@@ -136,7 +136,7 @@ Query Options
     .. versionadded:: 2014.7.0
 
     Display a list of configured profiles. Pass in a cloud provider to view
-    the provider's associated profiles, such as ``digital_ocean``, or pass in
+    the provider's associated profiles, such as ``digitalocean``, or pass in
     ``all`` to list all the configured profiles.
 
 

doc/ref/cli/salt.rst

@@ -81,7 +81,7 @@ Options
 
     Pass in an external authentication medium to validate against. The
     credentials will be prompted for. The options are `auto`,
-    `keystone`, `ldap`, `pam`, and `stormpath`. Can be used with the -T
+    `keystone`, `ldap`, and `pam`. Can be used with the -T
     option.
 
 .. option:: -T, --make-token

doc/ref/clouds/all/index.rst

@@ -13,7 +13,7 @@ Full list of Salt Cloud modules
     aliyun
     azurearm
     cloudstack
-    digital_ocean
+    digitalocean
     dimensiondata
     ec2
     gce
@@ -34,6 +34,8 @@ Full list of Salt Cloud modules
     scaleway
     softlayer
     softlayer_hw
+    vagrant
     virtualbox
     vmware
     vultrpy
+    xen

doc/ref/clouds/all/salt.cloud.clouds.digital_ocean.rst

@@ -1,6 +0,0 @@
-===============================
-salt.cloud.clouds.digital_ocean
-===============================
-
-.. automodule:: salt.cloud.clouds.digital_ocean
-    :members:

doc/ref/clouds/all/salt.cloud.clouds.digitalocean.rst

@@ -0,0 +1,6 @@
+==============================
+salt.cloud.clouds.digitalocean
+==============================
+
+.. automodule:: salt.cloud.clouds.digitalocean
+    :members:

doc/ref/clouds/all/salt.cloud.clouds.oneandone.rst

@@ -0,0 +1,6 @@
+===========================
+salt.cloud.clouds.oneandone
+===========================
+
+.. automodule:: salt.cloud.clouds.oneandone
+    :members:

doc/ref/clouds/all/salt.cloud.clouds.vagrant.rst

@@ -0,0 +1,6 @@
+=========================
+salt.cloud.clouds.vagrant
+=========================
+
+.. automodule:: salt.cloud.clouds.vagrant
+    :members:

doc/ref/clouds/all/salt.cloud.clouds.xen.rst

@@ -0,0 +1,6 @@
+=====================
+salt.cloud.clouds.xen
+=====================
+
+.. automodule:: salt.cloud.clouds.xen
+    :members:

doc/ref/configuration/master.rst

@@ -234,6 +234,7 @@ Valid options:
   - clouds
   - tops
   - roster
+  - tokens
 
 .. conf_master:: module_dirs
 
@@ -962,6 +963,19 @@ The TCP port for ``mworkers`` to connect to on the master.
 Salt-SSH Configuration
 ======================
 
+.. conf_master:: roster
+
+``roster``
+---------------
+
+Default: ``flat``
+
+Define the default salt-ssh roster module to use
+
+.. code-block:: yaml
+
+    roster: cache
+
 .. conf_master:: roster_file
 
 ``roster_file``
@@ -969,12 +983,31 @@ Salt-SSH Configuration
 
 Default: ``/etc/salt/roster``
 
-Pass in an alternative location for the salt-ssh roster file.
+Pass in an alternative location for the salt-ssh `flat` roster file.
 
 .. code-block:: yaml
 
     roster_file: /root/roster
 
+.. conf_master:: roster_file
+
+``rosters``
+---------------
+
+Default: None
+
+Define locations for `flat` roster files so they can be chosen when using Salt API.
+An administrator can place roster files into these locations.
+Then when calling Salt API, parameter 'roster_file' should contain a relative path to these locations.
+That is, "roster_file=/foo/roster" will be resolved as "/etc/salt/roster.d/foo/roster" etc.
+This feature prevents passing insecure custom rosters through the Salt API.
+
+.. code-block:: yaml
+
+    rosters:
+     - /etc/salt/roster.d
+     - /opt/salt/some/more/rosters
+
 .. conf_master:: ssh_passwd
 
 ``ssh_passwd``
@@ -1730,6 +1763,22 @@ Set additional directories to search for runner modules.
     runner_dirs:
       - /var/lib/salt/runners
 
+.. conf_master:: utils_dirs
+
+``utils_dirs``
+---------------
+
+.. versionadded:: Oxygen
+
+Default: ``[]``
+
+Set additional directories to search for util modules.
+
+.. code-block:: yaml
+
+    utils_dirs:
+      - /var/lib/salt/utils
+
 .. conf_master:: cython_enable
 
 ``cython_enable``
@@ -1759,7 +1808,8 @@ Default: ``top.sls``
 
 The state system uses a "top" file to tell the minions what environment to
 use and what modules to use. The state_top file is defined relative to the
-root of the base environment.
+root of the base environment. The value of "state_top" is also used for the
+pillar top file
 
 .. code-block:: yaml
 
@@ -1993,11 +2043,14 @@ output for states that failed or states that have changes.
 
 Default: ``full``
 
-The state_output setting changes if the output is the full multi line
-output for each changed state if set to 'full', but if set to 'terse'
-the output will be shortened to a single line.  If set to 'mixed', the output
-will be terse unless a state failed, in which case that output will be full.
-If set to 'changes', the output will be full unless the state didn't change.
+The state_output setting controls which results will be output full multi line:
+
+* ``full``, ``terse`` - each state will be full/terse
+* ``mixed`` - only states with errors will be full
+* ``changes`` - states with changes and errors will be full
+
+``full_id``, ``mixed_id``, ``changes_id`` and ``terse_id`` are also allowed;
+when set, the state ID will be used as name in the output.
 
 .. code-block:: yaml
 
@@ -2510,12 +2563,68 @@ gitfs remotes.
       - dev:
         - ref: develop
 
-.. conf_master:: gitfs_env_whitelist
+.. conf_master:: gitfs_disable_saltenv_mapping
 
-``gitfs_env_whitelist``
-***********************
+``gitfs_disable_saltenv_mapping``
+*********************************
+
+.. versionadded:: Oxygen
+
+Default: ``False``
+
+When set to ``True``, all saltenv mapping logic is disregarded (aside from
+which branch/tag is mapped to the ``base`` saltenv). To use any other
+environments, they must then be defined using :ref:`per-saltenv configuration
+parameters <gitfs-per-saltenv-config>`.
+
+.. code-block:: yaml
+
+    gitfs_disable_saltenv_mapping: True
+
+.. note::
+    This is is a global configuration option, see :ref:`here
+    <gitfs-per-remote-config>` for examples of configuring it for individual
+    repositories.
+
+.. conf_master:: gitfs_ref_types
+
+``gitfs_ref_types``
+*******************
+
+.. versionadded:: Oxygen
+
+Default: ``['branch', 'tag', 'sha']``
+
+This option defines what types of refs are mapped to fileserver environments
+(i.e. saltenvs). It also sets the order of preference when there are
+ambiguously-named refs (i.e. when a branch and tag both have the same name).
+The below example disables mapping of both tags and SHAs, so that only branches
+are mapped as saltenvs:
+
+.. code-block:: yaml
+
+    gitfs_ref_types:
+      - branch
+
+.. note::
+    This is is a global configuration option, see :ref:`here
+    <gitfs-per-remote-config>` for examples of configuring it for individual
+    repositories.
+
+.. note::
+    ``sha`` is special in that it will not show up when listing saltenvs (e.g.
+    with the :py:func:`fileserver.envs <salt.runners.fileserver.envs>` runner),
+    but works within states and with :py:func:`cp.cache_file
+    <salt.modules.cp.cache_file>` to retrieve a file from a specific git SHA.
+
+.. conf_master:: gitfs_saltenv_whitelist
+
+``gitfs_saltenv_whitelist``
+***************************
 
 .. versionadded:: 2014.7.0
+.. versionchanged:: Oxygen
+    Renamed from ``gitfs_env_whitelist`` to ``gitfs_saltenv_whitelist``
 
 Default: ``[]``
 
@@ -2526,17 +2635,19 @@ information can be found in the :ref:`GitFS Walkthrough
 
 .. code-block:: yaml
 
-    gitfs_env_whitelist:
+    gitfs_saltenv_whitelist:
       - base
       - v1.*
       - 'mybranch\d+'
 
-.. conf_master:: gitfs_env_blacklist
+.. conf_master:: gitfs_saltenv_blacklist
 
-``gitfs_env_blacklist``
-***********************
+``gitfs_saltenv_blacklist``
+***************************
 
 .. versionadded:: 2014.7.0
+.. versionchanged:: Oxygen
+    Renamed from ``gitfs_env_blacklist`` to ``gitfs_saltenv_blacklist``
 
 Default: ``[]``
 
@@ -2547,7 +2658,7 @@ information can be found in the :ref:`GitFS Walkthrough
 
 .. code-block:: yaml
 
-    gitfs_env_blacklist:
+    gitfs_saltenv_blacklist:
       - base
       - v1.*
       - 'mybranch\d+'
@@ -2880,12 +2991,14 @@ bookmark should be used as the ``base`` environment.
 
     hgfs_base: salt
 
-.. conf_master:: hgfs_env_whitelist
+.. conf_master:: hgfs_saltenv_whitelist
 
-``hgfs_env_whitelist``
-**********************
+``hgfs_saltenv_whitelist``
+**************************
 
 .. versionadded:: 2014.7.0
+.. versionchanged:: Oxygen
+    Renamed from ``hgfs_env_whitelist`` to ``hgfs_saltenv_whitelist``
 
 Default: ``[]``
 
@@ -2897,23 +3010,25 @@ expression must match the entire minion ID.
 If used, only branches/bookmarks/tags which match one of the specified
 expressions will be exposed as fileserver environments.
 
-If used in conjunction with :conf_master:`hgfs_env_blacklist`, then the subset
+If used in conjunction with :conf_master:`hgfs_saltenv_blacklist`, then the subset
 of branches/bookmarks/tags which match the whitelist but do *not* match the
 blacklist will be exposed as fileserver environments.
 
 .. code-block:: yaml
 
-    hgfs_env_whitelist:
+    hgfs_saltenv_whitelist:
       - base
       - v1.*
       - 'mybranch\d+'
 
-.. conf_master:: hgfs_env_blacklist
+.. conf_master:: hgfs_saltenv_blacklist
 
-``hgfs_env_blacklist``
-**********************
+``hgfs_saltenv_blacklist``
+**************************
 
 .. versionadded:: 2014.7.0
+.. versionchanged:: Oxygen
+    Renamed from ``hgfs_env_blacklist`` to ``hgfs_saltenv_blacklist``
 
 Default: ``[]``
 
@@ -2925,13 +3040,13 @@ expression must match the entire minion ID.
 If used, branches/bookmarks/tags which match one of the specified expressions
 will *not* be exposed as fileserver environments.
 
-If used in conjunction with :conf_master:`hgfs_env_whitelist`, then the subset
+If used in conjunction with :conf_master:`hgfs_saltenv_whitelist`, then the subset
 of branches/bookmarks/tags which match the whitelist but do *not* match the
 blacklist will be exposed as fileserver environments.
 
 .. code-block:: yaml
 
-    hgfs_env_blacklist:
+    hgfs_saltenv_blacklist:
       - base
       - v1.*
       - 'mybranch\d+'
@@ -3087,12 +3202,14 @@ also be configured on a per-remote basis, see :conf_master:`here
 
     svnfs_tags: tags
 
-.. conf_master:: svnfs_env_whitelist
+.. conf_master:: svnfs_saltenv_whitelist
 
-``svnfs_env_whitelist``
-***********************
+``svnfs_saltenv_whitelist``
+***************************
 
 .. versionadded:: 2014.7.0
+.. versionchanged:: Oxygen
+    Renamed from ``svnfs_env_whitelist`` to ``svnfs_saltenv_whitelist``
 
 Default: ``[]``
 
@@ -3104,23 +3221,25 @@ must match the entire minion ID.
 If used, only branches/tags which match one of the specified expressions will
 be exposed as fileserver environments.
 
-If used in conjunction with :conf_master:`svnfs_env_blacklist`, then the subset
+If used in conjunction with :conf_master:`svnfs_saltenv_blacklist`, then the subset
 of branches/tags which match the whitelist but do *not* match the blacklist
 will be exposed as fileserver environments.
 
 .. code-block:: yaml
 
-    svnfs_env_whitelist:
+    svnfs_saltenv_whitelist:
       - base
       - v1.*
       - 'mybranch\d+'
 
-.. conf_master:: svnfs_env_blacklist
+.. conf_master:: svnfs_saltenv_blacklist
 
-``svnfs_env_blacklist``
-***********************
+``svnfs_saltenv_blacklist``
+***************************
 
 .. versionadded:: 2014.7.0
+.. versionchanged:: Oxygen
+    Renamed from ``svnfs_env_blacklist`` to ``svnfs_saltenv_blacklist``
 
 Default: ``[]``
 
@@ -3132,13 +3251,13 @@ expression must match the entire minion ID.
 If used, branches/tags which match one of the specified expressions will *not*
 be exposed as fileserver environments.
 
-If used in conjunction with :conf_master:`svnfs_env_whitelist`, then the subset
+If used in conjunction with :conf_master:`svnfs_saltenv_whitelist`, then the subset
 of branches/tags which match the whitelist but do *not* match the blacklist
 will be exposed as fileserver environments.
 
 .. code-block:: yaml
 
-    svnfs_env_blacklist:
+    svnfs_saltenv_blacklist:
       - base
       - v1.*
       - 'mybranch\d+'
@@ -3703,7 +3822,7 @@ they were created by a different master.
 Default: ``True``
 
 Normally, when processing :ref:`git_pillar remotes
-<git-pillar-2015-8-0-and-later>`, if more than one repo under the same ``git``
+<git-pillar-configuration>`, if more than one repo under the same ``git``
 section in the ``ext_pillar`` configuration refers to the same pillar
 environment, then each repo in a given environment will have access to the
 other repos' files to be referenced in their top files. However, it may be

doc/ref/configuration/minion.rst

@@ -133,6 +133,24 @@ name) is set in the :conf_minion:`master` configuration setting.
 
     master_uri_format: ip_only
 
+.. conf_minion:: master_tops_first
+
+``master_tops_first``
+---------------------
+
+.. versionadded:: Oxygen
+
+Default: ``False``
+
+SLS targets defined using the :ref:`Master Tops <master-tops-system>` system
+are normally executed *after* any matches defined in the :ref:`Top File
+<states-top>`. Set this option to ``True`` to have the minion execute the
+:ref:`Master Tops <master-tops-system>` states first.
+
+.. code-block:: yaml
+
+    master_tops_first: True
+
 .. conf_minion:: master_type
 
 ``master_type``
@@ -448,6 +466,20 @@ FQDN (for instance, Solaris).
 
     append_domain: foo.org
 
+.. conf_minion:: minion_id_lowercase
+
+``minion_id_lowercase``
+-----------------------
+
+Default: ``False``
+
+Convert minion id to lowercase when it is being generated. Helpful when some hosts
+get the minion id in uppercase. Cached ids will remain the same and not converted.
+
+.. code-block:: yaml
+
+    minion_id_lowercase: True
+
 .. conf_minion:: cachedir
 
 ``cachedir``
@@ -674,7 +706,7 @@ Note these can be defined in the pillar for a minion as well.
 
 Default: ``60``
 
-The number of seconds a mine update runs.
+The number of minutes between mine updates.
 
 .. code-block:: yaml
 
@@ -1164,7 +1196,7 @@ be able to execute a certain module. The ``sys`` module is built into the minion
 and cannot be disabled.
 
 This setting can also tune the minion. Because all modules are loaded into system
-memory, disabling modules will lover the minion's memory footprint.
+memory, disabling modules will lower the minion's memory footprint.
 
 Modules should be specified according to their file name on the system and not by
 their virtual name. For example, to disable ``cmd``, use the string ``cmdmod`` which
@@ -1632,15 +1664,19 @@ output for states that failed or states that have changes.
 
 Default: ``full``
 
-The state_output setting changes if the output is the full multi line
-output for each changed state if set to 'full', but if set to 'terse'
-the output will be shortened to a single line.
+The state_output setting controls which results will be output full multi line:
+
+* ``full``, ``terse`` - each state will be full/terse
+* ``mixed`` - only states with errors will be full
+* ``changes`` - states with changes and errors will be full
+
+``full_id``, ``mixed_id``, ``changes_id`` and ``terse_id`` are also allowed;
+when set, the state ID will be used as name in the output.
 
 .. code-block:: yaml
 
     state_output: full
 
-
 .. conf_minion:: state_output_diff
 
 ``state_output_diff``
@@ -2081,6 +2117,41 @@ It will be interpreted as megabytes.
 
     file_recv_max_size: 100
 
+.. conf_minion:: pass_to_ext_pillars
+
+``pass_to_ext_pillars``
+-----------------------
+
+Specify a list of configuration keys whose values are to be passed to
+external pillar functions.
+
+Suboptions can be specified using the ':' notation (i.e. ``option:suboption``)
+
+The values are merged and included in the ``extra_minion_data`` optional
+parameter of the external pillar function.  The ``extra_minion_data`` parameter
+is passed only to the external pillar functions that have it explicitly
+specified in their definition.
+
+If the config contains
+
+.. code-block:: yaml
+
+    opt1: value1
+    opt2:
+      subopt1: value2
+      subopt2: value3
+
+    pass_to_ext_pillars:
+      - opt1
+      - opt2: subopt1
+
+the ``extra_minion_data`` parameter will be
+
+.. code-block:: python
+
+    {'opt1': 'value1',
+     'opt2': {'subopt1': 'value2'}}
+
 Security Settings
 =================
 
@@ -2337,11 +2408,14 @@ Thread Settings
 
 .. conf_minion:: multiprocessing
 
+``multiprocessing``
+-------
+
 Default: ``True``
 
-If `multiprocessing` is enabled when a minion receives a
+If ``multiprocessing`` is enabled when a minion receives a
 publication a new process is spawned and the command is executed therein.
-Conversely, if `multiprocessing` is disabled the new publication will be run
+Conversely, if ``multiprocessing`` is disabled the new publication will be run
 executed in a thread.
 
 
@@ -2349,6 +2423,23 @@ executed in a thread.
 
     multiprocessing: True
 
+.. conf_minion:: process_count_max
+
+``process_count_max``
+-------
+
+.. versionadded:: Oxygen
+
+Default: ``-1``
+
+Limit the maximum amount of processes or threads created by ``salt-minion``.
+This is useful to avoid resource exhaustion in case the minion receives more
+publications than it is able to handle, as it limits the number of spawned
+processes or threads. ``-1`` is the default and disables the limit.
+
+.. code-block:: yaml
+
+    process_count_max: -1
 
 .. _minion-logging-settings:
 

doc/ref/configuration/proxy.rst

@@ -118,3 +118,53 @@ has to be closed after every command.
 .. code-block:: yaml
 
     proxy_always_alive: False
+
+``proxy_merge_pillar_in_opts``
+------------------------------
+
+.. versionadded:: 2017.7.3
+
+Default: ``False``.
+
+Wheter the pillar data to be merged into the proxy configuration options.
+As multiple proxies can run on the same server, we may need different
+configuration options for each, while there's one single configuration file.
+The solution is merging the pillar data of each proxy minion into the opts.
+
+.. code-block:: yaml
+
+    proxy_merge_pillar_in_opts: True
+
+``proxy_deep_merge_pillar_in_opts``
+-----------------------------------
+
+.. versionadded:: 2017.7.3
+
+Default: ``False``.
+
+Deep merge of pillar data into configuration opts.
+This option is evaluated only when :conf_proxy:`proxy_merge_pillar_in_opts` is
+enabled.
+
+``proxy_merge_pillar_in_opts_strategy``
+---------------------------------------
+
+.. versionadded:: 2017.7.3
+
+Default: ``smart``.
+
+The strategy used when merging pillar configuration into opts.
+This option is evaluated only when :conf_proxy:`proxy_merge_pillar_in_opts` is
+enabled.
+
+``proxy_mines_pillar``
+----------------------
+
+.. versionadded:: 2017.7.3
+
+Default: ``True``.
+
+Allow enabling mine details using pillar data. This evaluates the mine
+configuration under the pillar, for the following regular minion options that
+are also equally available on the proxy minion: :conf_minion:`mine_interval`,
+and :conf_minion:`mine_functions`.

doc/ref/executors/all/index.rst

@@ -1,4 +1,4 @@
-.. _all-salt_executors:
+.. _all-salt.executors:
 
 =================
 executors modules

doc/ref/executors/index.rst

@@ -0,0 +1,85 @@
+.. _executors:
+
+=========
+Executors
+=========
+
+Executors are used by minion to execute module functions. Executors can be used
+to modify the functions behavior, do any pre-execution steps or execute in a
+specific way like sudo executor.
+
+Executors could be passed as a list and they will be used one-by-one in the
+order. If an executor returns ``None`` the next one will be called. If an
+executor returns non-``None`` the execution sequence is terminated and the
+returned value is used as a result. It's a way executor could control modules
+execution working as a filter. Note that executor could actually not execute
+the function but just do something else and return ``None`` like ``splay``
+executor does. In this case some other executor have to be used as a final
+executor that will actually execute the function. See examples below.
+
+Executors list could be passed by minion config file in the following way:
+
+.. code-block:: yaml
+
+    module_executors:
+      - splay
+      - direct_call
+    splaytime: 30
+
+The same could be done by command line:
+
+.. code-block:: bash
+
+    salt -t 40 --module-executors='[splay, direct_call]' --executor-opts='{splaytime: 30}' '*' test.ping
+
+And the same command called via netapi will look like this:
+
+.. code-block:: bash
+
+    curl -sSk https://localhost:8000 \
+        -H 'Accept: application/x-yaml' \
+        -H 'X-Auth-Token: 697adbdc8fe971d09ae4c2a3add7248859c87079' \
+        -H 'Content-type: application/json' \
+        -d '[{
+            "client": "local",
+            "tgt": "*",
+            "fun": "test.ping",
+            "module_executors": ["splay", "direct_call"],
+            "executor_opts": {"splaytime": 10}
+            }]'
+
+.. seealso:: :ref:`The full list of executors <all-salt.executors>`
+
+Writing Salt Executors
+----------------------
+
+A Salt executor is written in a similar manner to a Salt execution module.
+Executor is a python module placed into the ``executors`` folder and containing
+the ``execute`` function with the following signature:
+
+.. code-block:: python
+
+    def execute(opts, data, func, args, kwargs)
+
+Where the args are:
+
+``opts``:
+  Dictionary containing the minion configuration options
+``data``:
+  Dictionary containing the load data including ``executor_opts`` passed via
+  cmdline/API.
+``func``, ``args``, ``kwargs``:
+  Execution module function to be executed and it's arguments. For instance the
+  simplest ``direct_call`` executor just runs it as ``func(*args, **kwargs)``.
+``Returns``:
+  ``None`` if the execution sequence must be continued with the next executor.
+  Error string or execution result if the job is done and execution must be
+  stopped.
+
+Specific options could be passed to the executor via minion config or via
+``executor_opts`` argument. For instance to access ``splaytime`` option set by
+minion config executor should access ``opts.get('splaytime')``. To access the
+option set by commandline or API ``data.get('executor_opts',
+{}).get('splaytime')`` should be used. So if an option is safe and must be
+accessible by user executor should check it in both places, but if an option is
+unsafe it should be read from the only config ignoring the passed request data.

doc/ref/index.rst

@@ -12,6 +12,7 @@ This section contains a list of the Python modules that are used to extend the v
     ../ref/beacons/all/index
     ../ref/cache/all/index
     ../ref/engines/all/index
+    ../ref/executors/all/index
     ../ref/file_server/all/index
     ../ref/grains/all/index
     ../ref/modules/all/index

doc/ref/modules/all/index.rst

@@ -9,6 +9,7 @@ execution modules
     .. toctree::
 
         salt.modules.group
+        salt.modules.kernelpkg
         salt.modules.pkg
         salt.modules.user
 
@@ -37,13 +38,13 @@ execution modules
     bcache
     beacons
     bigip
-    blockdev
     bluez
     boto3_elasticache
     boto3_route53
     boto_apigateway
     boto_asg
     boto_cfn
+    boto_cloudfront
     boto_cloudtrail
     boto_cloudwatch
     boto_cloudwatch_event
@@ -97,6 +98,7 @@ execution modules
     cytest
     daemontools
     data
+    datadog_api
     ddns
     deb_apache
     deb_postgres
@@ -191,6 +193,8 @@ execution modules
     k8s
     kapacitor
     kerberos
+    kernelpkg_linux_apt
+    kernelpkg_linux_yum
     key
     keyboard
     keystone
@@ -200,6 +204,10 @@ execution modules
     layman
     ldap3
     ldapmod
+    libcloud_compute
+    libcloud_dns
+    libcloud_loadbalancer
+    libcloud_storage
     linux_acl
     linux_ip
     linux_lvm
@@ -293,6 +301,7 @@ execution modules
     opkg
     oracle
     osquery
+    out
     pacman
     pagerduty
     pagerduty_util
@@ -318,6 +327,7 @@ execution modules
     ps
     publish
     puppet
+    purefa
     pushbullet
     pushover_notify
     pw_group
@@ -392,7 +402,6 @@ execution modules
     state
     status
     statuspage
-    stormpath
     supervisord
     suse_apache
     svn
@@ -410,6 +419,7 @@ execution modules
     test
     testinframod
     test_virtual
+    textfsm_mod
     timezone
     tls
     tomcat
@@ -422,6 +432,7 @@ execution modules
     uptime
     useradd
     uwsgi
+    vagrant
     varnish
     vault
     vbox_guest

doc/ref/modules/all/salt.modules.blockdev.rst

@@ -1,6 +0,0 @@
-=====================
-salt.modules.blockdev
-=====================
-
-.. automodule:: salt.modules.blockdev
-    :members:

doc/ref/modules/all/salt.modules.boto_cloudfront.rst

@@ -0,0 +1,6 @@
+============================
+salt.modules.boto_cloudfront
+============================
+
+.. automodule:: salt.modules.boto_cloudfront
+    :members:

doc/ref/modules/all/salt.modules.datadog_api.rst

@@ -0,0 +1,6 @@
+========================
+salt.modules.datadog_api
+========================
+
+.. automodule:: salt.modules.datadog_api
+    :members:

doc/ref/modules/all/salt.modules.kernelpkg.rst

@@ -0,0 +1,19 @@
+.. _virtual-kernelpkg:
+
+======================
+salt.modules.kernelpkg
+======================
+
+.. py:module:: salt.modules.kernelpkg
+    :synopsis: A virtual module for managing kernel packages
+
+``kernelpkg`` is a virtual module that is fulfilled by one of the following modules:
+
+============================================ ========================================
+Execution Module                             Used for
+============================================ ========================================
+:py:mod:`~salt.modules.kernelpkg_linux_apt`  Debian/Ubuntu-based distros which use
+                                             ``apt-get`` for package management
+:py:mod:`~salt.modules.kernelpkg_linux_yum`  RedHat-based distros and derivatives
+                                             using ``yum`` or ``dnf``
+============================================ ========================================

doc/ref/modules/all/salt.modules.kernelpkg_linux_apt.rst

@@ -0,0 +1,6 @@
+================================
+salt.modules.kernelpkg_linux_apt
+================================
+
+.. automodule:: salt.modules.kernelpkg_linux_apt
+    :members:

doc/ref/modules/all/salt.modules.kernelpkg_linux_yum.rst

@@ -0,0 +1,6 @@
+================================
+salt.modules.kernelpkg_linux_yum
+================================
+
+.. automodule:: salt.modules.kernelpkg_linux_yum
+    :members:

doc/ref/modules/all/salt.modules.libcloud_compute.rst

@@ -0,0 +1,6 @@
+salt.modules.libcloud_compute module
+====================================
+
+.. automodule:: salt.modules.libcloud_compute
+    :members:
+    :undoc-members:

doc/ref/modules/all/salt.modules.libcloud_loadbalancer.rst

@@ -0,0 +1,6 @@
+==================================
+salt.modules.libcloud_loadbalancer
+==================================
+
+.. automodule:: salt.modules.libcloud_loadbalancer
+    :members:

doc/ref/modules/all/salt.modules.libcloud_storage.rst

@@ -0,0 +1,6 @@
+salt.modules.libcloud_storage module
+================================
+
+.. automodule:: salt.modules.libcloud_storage
+    :members:
+    :undoc-members:

doc/ref/modules/all/salt.modules.out.rst

@@ -0,0 +1,5 @@
+salt.modules.out module
+=======================
+
+.. automodule:: salt.modules.out
+    :members:

doc/ref/modules/all/salt.modules.purefa.rst

@@ -0,0 +1,6 @@
+===================
+salt.modules.purefa
+===================
+
+.. automodule:: salt.modules.purefa
+    :members:

doc/ref/modules/all/salt.modules.stormpath.rst

@@ -1,6 +0,0 @@
-======================
-salt.modules.stormpath
-======================
-
-.. automodule:: salt.modules.stormpath
-    :members:

doc/ref/modules/all/salt.modules.test.rst

@@ -3,4 +3,5 @@ salt.modules.test
 =================
 
 .. automodule:: salt.modules.test
-    :members:
+    :members:
+    :exclude-members: rand_str

doc/ref/modules/all/salt.modules.textfsm_mod.rst

@@ -0,0 +1,5 @@
+salt.modules.textfsm_mod module
+===============================
+
+.. automodule:: salt.modules.textfsm_mod
+    :members:

doc/ref/modules/all/salt.modules.vagrant.rst

@@ -0,0 +1,6 @@
+====================
+salt.modules.vagrant
+====================
+
+.. automodule:: salt.modules.vagrant
+    :members:

doc/ref/modules/all/salt.modules.zookeeper.rst

@@ -0,0 +1,6 @@
+======================
+salt.modules.zookeeper
+======================
+
+.. automodule:: salt.modules.zookeeper
+    :members:

doc/ref/modules/index.rst

@@ -13,7 +13,7 @@ Writing Salt execution modules is straightforward.
 
 A Salt execution module is a Python or `Cython`_ module placed in a directory
 called ``_modules/`` at the root of the Salt fileserver. When using the default
-fileserver backend (i.e. :py:mod:`roots <salt.fileserver.roots`), unless
+fileserver backend (i.e. :py:mod:`roots <salt.fileserver.roots>`), unless
 environments are otherwise defined in the :conf_master:`file_roots` config
 option, the ``_modules/`` directory would be located in ``/srv/salt/_modules``
 on most systems.
@@ -209,6 +209,29 @@ default configuration file for the minion contains the information and format
 used to pass data to the modules. :mod:`salt.modules.test`,
 :file:`conf/minion`.
 
+.. _module_init:
+
+``__init__`` Function
+---------------------
+
+If you want your module to have different execution modes based on minion
+configuration, you can use the ``__init__(opts)`` function to perform initial
+module setup. The parameter ``opts`` is the complete minion configuration,
+as also available in the ``__opts__`` dict.
+
+.. code-block:: python
+
+    '''
+    Cheese module initialization example
+    '''
+    def __init__(opts):
+        '''
+        Allow foreign imports if configured to do so
+        '''
+        if opts.get('cheese.allow_foreign', False):
+            _enable_foreign_products()
+
+
 Strings and Unicode
 ===================
 
@@ -273,8 +296,9 @@ module is not loaded. ``False`` lets the module perform system checks and
 prevent loading if dependencies are not met.
 
 Since ``__virtual__`` is called before the module is loaded, ``__salt__`` will
-be unavailable as it will not have been packed into the module at this point in
-time.
+be unreliable as not all modules will be available at this point in time. The
+``__pillar`` and ``__grains__`` :ref:`"dunder" dictionaries <dunder-dictionaries>`
+are available however.
 
 .. note::
     Modules which return a string from ``__virtual__`` that is already used by
@@ -313,10 +337,14 @@ the case when the dependency is unavailable.
         else:
             return False, 'The cheese execution module cannot be loaded: enzymes unavailable.'
 
+    def slice():
+        pass
+
 .. code-block:: python
 
     '''
-    Cheese state module
+    Cheese state module. Note that this works in state modules because it is
+    guaranteed that execution modules are loaded first
     '''
 
     def __virtual__():
@@ -401,7 +429,7 @@ similar to the following:
        Confine this module to Mac OS with Homebrew.
        '''
 
-       if salt.utils.which('brew') and __grains__['os'] == 'MacOS':
+       if salt.utils.path.which('brew') and __grains__['os'] == 'MacOS':
            return __virtualname__
        return False
 
@@ -423,7 +451,7 @@ For example:
         '''
         Only load if git exists on the system
         '''
-        if salt.utils.which('git') is None:
+        if salt.utils.path.which('git') is None:
             return (False,
                     'The git execution module cannot be loaded: git unavailable.')
         else:

doc/ref/netapi/all/salt.netapi.rest_cherrypy.rst

@@ -2,6 +2,9 @@
 rest_cherrypy
 =============
 
+.. contents::
+    :local:
+
 .. automodule:: salt.netapi.rest_cherrypy.app
 
 .. automodule:: salt.netapi.rest_cherrypy.wsgi
@@ -11,9 +14,6 @@ REST URI Reference
 
 .. py:currentmodule:: salt.netapi.rest_cherrypy.app
 
-.. contents::
-    :local:
-
 ``/``
 -----
 
@@ -78,4 +78,4 @@ REST URI Reference
 ----------
 
 .. autoclass:: Stats
-    :members: GET
+    :members: GET

doc/ref/publisheracl.rst

@@ -25,6 +25,9 @@ configuration:
         - web*:
           - test.*
           - pkg.*
+      # Allow managers to use saltutil module functions
+      manager_.*:
+        - saltutil.*
 
 Permission Issues
 -----------------

doc/ref/renderers/index.rst

@@ -146,8 +146,10 @@ Here is a simple YAML renderer example:
 
     import yaml
     from salt.utils.yamlloader import SaltYamlSafeLoader
+    from salt.ext import six
+
     def render(yaml_data, saltenv='', sls='', **kws):
-        if not isinstance(yaml_data, basestring):
+        if not isinstance(yaml_data, six.string_types):
             yaml_data = yaml_data.read()
         data = yaml.load(
             yaml_data,

doc/ref/returners/index.rst

@@ -1,3 +1,5 @@
+.. _returners:
+
 =========
 Returners
 =========
@@ -45,6 +47,13 @@ test.ping command will be sent out to the three named returners.
 Writing a Returner
 ==================
 
+Returners are Salt modules that allow the redirection of results data to targets other than the Salt Master.
+
+Returners Are Easy To Write!
+----------------------------
+
+Writing a Salt returner is straightforward.
+
 A returner is a Python module containing at minimum a ``returner`` function.
 Other optional functions can be included to add support for
 :conf_master:`master_job_cache`, :ref:`external-job-cache`, and `Event Returners`_.
@@ -82,6 +91,46 @@ Other optional functions can be included to add support for
 The above example of a returner set to send the data to a Redis server
 serializes the data as JSON and sets it in redis.
 
+Using Custom Returner Modules
+-----------------------------
+
+Place custom returners in a ``_returners/`` directory within the
+:conf_master:`file_roots` specified by the master config file.
+
+Custom returners are distributed when any of the following are called:
+
+- :mod:`state.apply <salt.modules.state.apply_>`
+- :mod:`saltutil.sync_returners <salt.modules.saltutil.sync_returners>`
+- :mod:`saltutil.sync_all <salt.modules.saltutil.sync_all>`
+
+Any custom returners which have been synced to a minion that are named the
+same as one of Salt's default set of returners will take the place of the
+default returner with the same name.
+
+Naming the Returner
+-------------------
+
+Note that a returner's default name is its filename (i.e. ``foo.py`` becomes
+returner ``foo``), but that its name can be overridden by using a
+:ref:`__virtual__ function <virtual-modules>`. A good example of this can be
+found in the `redis`_ returner, which is named ``redis_return.py`` but is
+loaded as simply ``redis``:
+
+.. code-block:: python
+
+    try:
+        import redis
+        HAS_REDIS = True
+    except ImportError:
+        HAS_REDIS = False
+
+    __virtualname__ = 'redis'
+
+    def __virtual__():
+        if not HAS_REDIS:
+            return False
+        return __virtualname__
+
 Master Job Cache Support
 ------------------------
 
@@ -282,46 +331,6 @@ contains the jid and therefore is guaranteed to be unique.
                       VALUES (%s, %s, %s)'''
              cur.execute(sql, (tag, json.dumps(data), __opts__['id']))
 
-Custom Returners
-----------------
-
-Place custom returners in a ``_returners`` directory within the
-:conf_master:`file_roots` specified by the master config file.
-
-Custom returners are distributed when any of the following are called:
-
-- :mod:`state.apply <salt.modules.state.apply_>`
-- :mod:`saltutil.sync_returners <salt.modules.saltutil.sync_returners>`
-- :mod:`saltutil.sync_all <salt.modules.saltutil.sync_all>`
-
-Any custom returners which have been synced to a minion that are named the
-same as one of Salt's default set of returners will take the place of the
-default returner with the same name.
-
-Naming the Returner
--------------------
-
-Note that a returner's default name is its filename (i.e. ``foo.py`` becomes
-returner ``foo``), but that its name can be overridden by using a
-:ref:`__virtual__ function <virtual-modules>`. A good example of this can be
-found in the `redis`_ returner, which is named ``redis_return.py`` but is
-loaded as simply ``redis``:
-
-.. code-block:: python
-
-    try:
-        import redis
-        HAS_REDIS = True
-    except ImportError:
-        HAS_REDIS = False
-
-    __virtualname__ = 'redis'
-
-    def __virtual__():
-        if not HAS_REDIS:
-            return False
-        return __virtualname__
-
 
 Testing the Returner
 --------------------

doc/ref/runners/all/index.rst

@@ -43,7 +43,6 @@ runner modules
     saltutil
     sdb
     smartos_vmadm
-    search
     spacewalk
     ssh
     state

doc/ref/runners/all/salt.runners.auth.rst

@@ -1,5 +1,5 @@
-salt.runners.auth module
-========================
+salt.runners.auth
+=================
 
 .. automodule:: salt.runners.auth
     :members:

doc/ref/runners/all/salt.runners.digicertapi.rst

@@ -1,5 +1,5 @@
-salt.runners.digicertapi module
-===============================
+salt.runners.digicertapi
+========================
 
 .. automodule:: salt.runners.digicertapi
     :members:

doc/ref/runners/all/salt.runners.event.rst

@@ -1,5 +1,5 @@
-salt.runners.event module
-=========================
+salt.runners.event
+==================
 
 .. automodule:: salt.runners.event
     :members:

doc/ref/runners/all/salt.runners.mattermost.rst

@@ -1,5 +1,11 @@
-salt.runners.mattermost module
-==============================
+salt.runners.mattermost
+=======================
+
+**Note for 2017.7 releases!**
+
+Due to the `salt.runners.config <https://github.com/saltstack/salt/blob/develop/salt/runners/config.py>`_ module not being available in this release series, importing the `salt.runners.config <https://github.com/saltstack/salt/blob/develop/salt/runners/config.py>`_ module from the develop branch is required to make this module work.
+
+Ref: `Mattermost runner failing to retrieve config values due to unavailable config runner #43479 <https://github.com/saltstack/salt/issues/43479>`_
 
 .. automodule:: salt.runners.mattermost
     :members:

doc/ref/runners/all/salt.runners.search.rst

@@ -1,6 +0,0 @@
-===================
-salt.runners.search
-===================
-
-.. automodule:: salt.runners.search
-    :members:

doc/ref/runners/all/salt.runners.smartos_vmadm.rst

@@ -1,5 +1,5 @@
-salt.runners.smartos_vmadm module
-=================================
+salt.runners.smartos_vmadm
+==========================
 
 .. automodule:: salt.runners.smartos_vmadm
     :members:

doc/ref/runners/all/salt.runners.state.rst

@@ -4,4 +4,4 @@ salt.runners.state
 
 .. automodule:: salt.runners.state
     :members:
-    :exclude-members: sls, orch
+    :exclude-members: sls, orch, orch_show_sls

doc/ref/runners/all/salt.runners.vault.rst

@@ -1,5 +1,5 @@
-salt.runners.vault module
-=========================
+salt.runners.vault
+==================
 
 .. automodule:: salt.runners.vault
     :members:

doc/ref/runners/all/salt.runners.venafiapi.rst

@@ -1,5 +1,5 @@
-salt.runners.venafiapi module
-=============================
+salt.runners.venafiapi
+======================
 
 .. automodule:: salt.runners.venafiapi
     :members:

doc/ref/runners/all/salt.runners.vistara.rst

@@ -1,5 +1,5 @@
-salt.runners.vistara module
-===========================
+salt.runners.vistara
+====================
 
 .. automodule:: salt.runners.vistara
     :members:

doc/ref/states/aggregate.rst

@@ -122,7 +122,7 @@ This example, simplified from the pkg state, shows how to create mod_aggregate f
         for chunk in chunks:
             # The state runtime uses "tags" to track completed jobs, it may
             # look familiar with the _|-
-            tag = salt.utils.gen_state_tag(chunk)
+            tag = __utils__['state.gen_tag'](chunk)
             if tag in running:
                 # Already ran the pkg state, skip aggregation
                 continue

doc/ref/states/all/index.rst

@@ -31,6 +31,7 @@ state modules
     boto_apigateway
     boto_asg
     boto_cfn
+    boto_cloudfront
     boto_cloudtrail
     boto_cloudwatch_alarm
     boto_cloudwatch_event
@@ -132,6 +133,7 @@ state modules
     junos
     k8s
     kapacitor
+    kernelpkg
     keyboard
     keystone
     kmod
@@ -139,8 +141,11 @@ state modules
     layman
     ldap
     libcloud_dns
+    libcloud_loadbalancer
+    libcloud_storage
     linux_acl
     locale
+    logadm
     logrotate
     loop
     lvm
@@ -175,6 +180,7 @@ state modules
     netusers
     network
     netyang
+    nfs_export
     nftables
     npm
     ntp
@@ -246,7 +252,6 @@ state modules
     stateconf
     status
     statuspage
-    stormpath_account
     supervisord
     svn
     sysctl
@@ -262,6 +267,7 @@ state modules
     tuned
     uptime
     user
+    vagrant
     vault
     vbox_guest
     victorops

doc/ref/states/all/salt.states.boto_cloudfront.rst

@@ -0,0 +1,6 @@
+===========================
+salt.states.boto_cloudfront
+===========================
+
+.. automodule:: salt.states.boto_cloudfront
+    :members:

doc/ref/states/all/salt.states.kernelpkg.rst

@@ -0,0 +1,6 @@
+=====================
+salt.states.kernelpkg
+=====================
+
+.. automodule:: salt.states.kernelpkg
+    :members:

doc/ref/states/all/salt.states.libcloud_loadbalancer.rst

@@ -0,0 +1,6 @@
+salt.states.libcloud_loadbalancer module
+========================================
+
+.. automodule:: salt.states.libcloud_loadbalancer
+    :members:
+    :undoc-members:

doc/ref/states/all/salt.states.libcloud_storage.rst

@@ -0,0 +1,6 @@
+salt.states.libcloud_storage module
+===================================
+
+.. automodule:: salt.states.libcloud_storage
+    :members:
+    :undoc-members:

doc/ref/states/all/salt.states.logadm.rst

@@ -0,0 +1,5 @@
+salt.states.logadm module
+=========================
+
+.. automodule:: salt.states.logadm
+    :members:

doc/ref/states/all/salt.states.nfs_export.rst

@@ -0,0 +1,6 @@
+======================
+salt.states.nfs_export
+======================
+
+.. automodule:: salt.states.nfs_export
+    :members:

doc/ref/states/all/salt.states.stormpath_account.rst

@@ -1,6 +0,0 @@
-=============================
-salt.states.stormpath_account
-=============================
-
-.. automodule:: salt.states.stormpath_account
-    :members:

doc/ref/states/all/salt.states.vagrant.rst

@@ -0,0 +1,6 @@
+===================
+salt.states.vagrant
+===================
+
+.. automodule:: salt.states.vagrant
+    :members:

doc/ref/states/all/salt.states.zookeeper.rst

@@ -0,0 +1,6 @@
+=====================
+salt.states.zookeeper
+=====================
+
+.. automodule:: salt.states.zookeeper
+    :members:

doc/ref/states/parallel.rst

@@ -6,7 +6,7 @@ Introduced in Salt version ``2017.7.0`` it is now possible to run select states
 in parallel. This is accomplished very easily by adding the ``parallel: True``
 option to your state declaration:
 
-.. code_block:: yaml
+.. code-block:: yaml
 
     nginx:
       service.running:
@@ -24,7 +24,7 @@ state to finish.
 
 Given this example:
 
-.. code_block:: yaml
+.. code-block:: yaml
 
     sleep 10:
       cmd.run:
@@ -74,16 +74,16 @@ also complete.
 Things to be Careful of
 =======================
 
-Parallel States does not prevent you from creating parallel conflicts on your
+Parallel States do not prevent you from creating parallel conflicts on your
 system. This means that if you start multiple package installs using Salt then
 the package manager will block or fail. If you attempt to manage the same file
 with multiple states in parallel then the result can produce an unexpected
 file.
 
 Make sure that the states you choose to run in parallel do not conflict, or
-else, like in and parallel programming environment, the outcome may not be
+else, like in any parallel programming environment, the outcome may not be
 what you expect. Doing things like just making all states run in parallel
-will almost certinly result in unexpected behavior.
+will almost certainly result in unexpected behavior.
 
 With that said, running states in parallel should be safe the vast majority
 of the time and the most likely culprit for unexpected behavior is running

doc/ref/states/writing.rst

@@ -135,21 +135,30 @@ A State Module must return a dict containing the following keys/values:
   ``test=True``, and changes would have been made if the state was not run in
   test mode.
 
-  +--------------------+-----------+-----------+
-  |                    | live mode | test mode |
-  +====================+===========+===========+
-  | no changes         | ``True``  | ``True``  |
-  +--------------------+-----------+-----------+
-  | successful changes | ``True``  | ``None``  |
-  +--------------------+-----------+-----------+
-  | failed changes     | ``False`` | ``None``  |
-  +--------------------+-----------+-----------+
+  +--------------------+-----------+------------------------+
+  |                    | live mode | test mode              |
+  +====================+===========+========================+
+  | no changes         | ``True``  | ``True``               |
+  +--------------------+-----------+------------------------+
+  | successful changes | ``True``  | ``None``               |
+  +--------------------+-----------+------------------------+
+  | failed changes     | ``False`` | ``False`` or ``None``  |
+  +--------------------+-----------+------------------------+
 
   .. note::
 
-      Test mode does not predict if the changes will be successful or not.
+      Test mode does not predict if the changes will be successful or not,
+      and hence the result for pending changes is usually ``None``.
 
-- **comment:** A string containing a summary of the result.
+      However, if a state is going to fail and this can be determined
+      in test mode without applying the change, ``False`` can be returned.
+
+- **comment:** A list of strings or a single string summarizing the result.
+  Note that support for lists of strings is available as of Salt Oxygen.
+  Lists of strings will be joined with newlines to form the final comment;
+  this is useful to allow multiple comments from subparts of a state.
+  Prefer to keep line lengths short (use multiple lines as needed),
+  and end with punctuation (e.g. a period) to delimit multiple comments.
 
 The return data can also, include the **pchanges** key, this stands for
 `predictive changes`. The **pchanges** key informs the State system what

doc/spelling_wordlist.txt

@@ -777,8 +777,6 @@ Stateconf
 stderr
 stdin
 stdout
-stormpath
-Stormpath
 str
 strftime
 subfolder

doc/topics/beacons/index.rst

@@ -34,7 +34,7 @@ monitored, everything is configured using Salt.
 
 Beacons are typically enabled by placing a ``beacons:`` top level block in
 ``/etc/salt/minion`` or any file in ``/etc/salt/minion.d/`` such as
-``/etc/salt/minion.d/beacons.conf``:
+``/etc/salt/minion.d/beacons.conf`` or add it to pillars for that minion:
 
 .. code-block:: yaml
 

doc/topics/cloud/aws.rst

@@ -57,7 +57,7 @@ parameters are discussed in more detail below.
       id: 'use-instance-role-credentials'
       key: 'use-instance-role-credentials'
 
-      # Make sure this key is owned by root with permissions 0400.
+      # Make sure this key is owned by corresponding user (default 'salt') with permissions 0400.
       #
       private_key: /etc/salt/my_test_key.pem
       keyname: my_test_key
@@ -471,7 +471,7 @@ EC2 API or AWS Console.
 By default, the spot instance type is set to 'one-time', meaning it will
 be launched and, if it's ever terminated for whatever reason, it will not
 be recreated. If you would like your spot instances to be relaunched after
-a termination (by your or AWS), set the ``type`` to 'persistent'.
+a termination (by you or AWS), set the ``type`` to 'persistent'.
 
 NOTE: Spot instances are a great way to save a bit of money, but you do
 run the risk of losing your spot instances if the current price for the
@@ -610,7 +610,7 @@ just instances:
 
     salt-cloud -f get_tags my_ec2 resource_id=af5467ba
     salt-cloud -f set_tags my_ec2 resource_id=af5467ba tag1=somestuff
-    salt-cloud -f del_tags my_ec2 resource_id=af5467ba tag1,tag2,tag3
+    salt-cloud -f del_tags my_ec2 resource_id=af5467ba tags=tag1,tag2,tag3
 
 
 Rename EC2 Instances

doc/topics/cloud/azurearm.rst

@@ -6,7 +6,7 @@ Getting Started With Azure ARM
 
 Azure is a cloud service by Microsoft providing virtual machines, SQL services,
 media services, and more. Azure ARM (aka, the Azure Resource Manager) is a next
-generatiom version of the Azure portal and API. This document describes how to
+generation version of the Azure portal and API. This document describes how to
 use Salt Cloud to create a virtual machine on Azure ARM, with Salt installed.
 
 More information about Azure is located at `http://www.windowsazure.com/
@@ -15,9 +15,7 @@ More information about Azure is located at `http://www.windowsazure.com/
 
 Dependencies
 ============
-* `Microsoft Azure SDK for Python <https://pypi.python.org/pypi/azure>`_ >= 2.0rc6
-* `Microsoft Azure Storage SDK for Python <https://pypi.python.org/pypi/azure-storage>`_ >= 0.32
-* The python-requests library, for Python < 2.7.9.
+* Azure Cli ```pip install 'azure-cli>=2.0.12'```
 * A Microsoft Azure account
 * `Salt <https://github.com/saltstack/salt>`_
 
@@ -223,11 +221,39 @@ subnet
 Optional. The subnet inside the virtual network that the VM will be spun up in.
 Default is ``default``.
 
+load_balancer
+-------------
+Optional. The load-balancer for the VM's network interface to join. If
+specified the backend_pool option need to be set.
+
+backend_pool
+------------
+Optional. Required if the load_balancer option is set. The load-balancer's
+Backend Pool the VM's network interface will join.
+
 iface_name
 ----------
 Optional. The name to apply to the VM's network interface. If not supplied, the
 value will be set to ``<VM name>-iface0``.
 
+dns_servers
+-----------
+Optional. A **list** of the DNS servers to configure for the network interface
+(will be set on the VM by the DHCP of the VNET).
+
+.. code-block:: yaml
+
+    my-azurearm-profile:
+      provider: azurearm-provider
+      network: mynetwork
+      dns_servers:
+        - 10.1.1.4
+        - 10.1.1.5
+
+availability_set
+----------------
+Optional. If set, the VM will be added to the specified availability set.
+
 cleanup_disks
 -------------
 Optional. Default is ``False``. If set to ``True``, disks will be cleaned up

doc/topics/cloud/cloud.rst

@@ -146,24 +146,24 @@ library. The following two lines set up the imports:
 .. code-block:: python
 
     from salt.cloud.libcloudfuncs import *   # pylint: disable=W0614,W0401
-    from salt.utils import namespaced_function
+    import salt.utils.functools
 
 And then a series of declarations will make the necessary functions available
 within the cloud module.
 
 .. code-block:: python
 
-    get_size = namespaced_function(get_size, globals())
-    get_image = namespaced_function(get_image, globals())
-    avail_locations = namespaced_function(avail_locations, globals())
-    avail_images = namespaced_function(avail_images, globals())
-    avail_sizes = namespaced_function(avail_sizes, globals())
-    script = namespaced_function(script, globals())
-    destroy = namespaced_function(destroy, globals())
-    list_nodes = namespaced_function(list_nodes, globals())
-    list_nodes_full = namespaced_function(list_nodes_full, globals())
-    list_nodes_select = namespaced_function(list_nodes_select, globals())
-    show_instance = namespaced_function(show_instance, globals())
+    get_size = salt.utils.functools.namespaced_function(get_size, globals())
+    get_image = salt.utils.functools.namespaced_function(get_image, globals())
+    avail_locations = salt.utils.functools.namespaced_function(avail_locations, globals())
+    avail_images = salt.utils.functools.namespaced_function(avail_images, globals())
+    avail_sizes = salt.utils.functools.namespaced_function(avail_sizes, globals())
+    script = salt.utils.functools.namespaced_function(script, globals())
+    destroy = salt.utils.functools.namespaced_function(destroy, globals())
+    list_nodes = salt.utils.functools.namespaced_function(list_nodes, globals())
+    list_nodes_full = salt.utils.functools.namespaced_function(list_nodes_full, globals())
+    list_nodes_select = salt.utils.functools.namespaced_function(list_nodes_select, globals())
+    show_instance = salt.utils.functools.namespaced_function(show_instance, globals())
 
 If necessary, these functions may be replaced by removing the appropriate
 declaration line, and then adding the function as normal.
@@ -183,7 +183,7 @@ imports should be absent from the Salt Cloud module.
 
 A good example of a non-libcloud driver is the DigitalOcean driver:
 
-https://github.com/saltstack/salt/tree/develop/salt/cloud/clouds/digital_ocean.py
+https://github.com/saltstack/salt/tree/develop/salt/cloud/clouds/digitalocean.py
 
 The ``create()`` Function
 -------------------------

doc/topics/cloud/config.rst

@@ -56,6 +56,24 @@ settings can be placed in the provider or profile:
         sls_list:
           - web
 
+
+When salt cloud creates a new minon, it can automatically add grain information
+to the minion configuration file identifying the sources originally used
+to define it.
+
+The generated grain information will appear similar to:
+
+.. code-block:: yaml
+
+    grains:
+      salt-cloud:
+        driver: ec2
+        provider: my_ec2:ec2
+        profile: ec2-web
+
+The generation of the salt-cloud grain can be surpressed by the
+option ``enable_cloud_grains: 'False'`` in the cloud configuration file.
+
 Cloud Configuration Syntax
 ==========================
 
@@ -426,7 +444,7 @@ under the API Access tab.
 .. code-block:: yaml
 
     my-digitalocean-config:
-      driver: digital_ocean
+      driver: digitalocean
       personal_access_token: xxx
       location: New York 1
 
@@ -522,6 +540,17 @@ machines which are already installed, but not Salted. For more information about
 this driver and for configuration examples, please see the
 :ref:`Gettting Started with Saltify <getting-started-with-saltify>` documentation.
 
+.. _config_vagrant:
+
+Vagrant
+-------
+
+The Vagrant driver is a new, experimental driver for controlling a VagrantBox
+virtual machine, and installing Salt on it. The target host machine must be a
+working salt minion, which is controlled via the salt master using salt-api.
+For more information, see
+:ref:`Getting Started With Vagrant <getting-started-with-vagrant>`.
+
 
 Extending Profiles and Cloud Providers Configuration
 ====================================================

doc/topics/cloud/deploy.rst

@@ -89,7 +89,7 @@ functions include:
 A good, well commented example of this process is the Fedora deployment
 script:
 
-https://github.com/saltstack/salt-cloud/blob/master/saltcloud/deploy/Fedora.sh
+https://github.com/saltstack/salt/blob/develop/salt/cloud/deploy/Fedora.sh
 
 A number of legacy deploy scripts are included with the release tarball. None
 of them are as functional or complete as Salt Bootstrap, and are still included

doc/topics/cloud/digitalocean.rst

@@ -19,7 +19,7 @@ under the "SSH Keys" section.
     # /etc/salt/cloud.providers.d/ directory.
 
     my-digitalocean-config:
-      driver: digital_ocean
+      driver: digitalocean
       personal_access_token: xxx
       ssh_key_file: /path/to/ssh/key/file
       ssh_key_names: my-key-name,my-key-name-2
@@ -54,6 +54,10 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or in the
       ipv6: True
       create_dns_record: True
       userdata_file: /etc/salt/cloud.userdata.d/setup
+      tags:
+        - tag1
+        - tag2
+        - tag3
 
 Locations can be obtained using the ``--list-locations`` option for the ``salt-cloud``
 command:
@@ -63,7 +67,7 @@ command:
     # salt-cloud --list-locations my-digitalocean-config
     my-digitalocean-config:
         ----------
-        digital_ocean:
+        digitalocean:
             ----------
             Amsterdam 1:
                 ----------
@@ -87,7 +91,7 @@ command:
     # salt-cloud --list-sizes my-digitalocean-config
     my-digitalocean-config:
         ----------
-        digital_ocean:
+        digitalocean:
             ----------
             512MB:
                 ----------
@@ -117,7 +121,7 @@ command:
     # salt-cloud --list-images my-digitalocean-config
     my-digitalocean-config:
         ----------
-        digital_ocean:
+        digitalocean:
             ----------
             10.1:
                 ----------
@@ -142,7 +146,7 @@ Profile Specifics:
 ssh_username
 ------------
 
-If using a FreeBSD image from Digital Ocean, you'll need to set the ``ssh_username``
+If using a FreeBSD image from DigitalOcean, you'll need to set the ``ssh_username``
 setting to ``freebsd`` in your profile configuration.
 
 .. code-block:: yaml

doc/topics/cloud/features.rst

@@ -38,26 +38,30 @@ These are features that are available for almost every cloud host.
 
 .. container:: scrollable
 
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |                       |AWS     |CloudStack|Digital|EC2|GoGrid|JoyEnt|Linode|OpenStack|Parallels|Rackspace|Saltify|Softlayer|Softlayer|Aliyun|
-    |                       |(Legacy)|          |Ocean  |   |      |      |      |         |         |(Legacy) |       |         |Hardware |      |
-    +=======================+========+==========+=======+===+======+======+======+=========+=========+=========+=======+=========+=========+======+
-    |Query                  |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |       |Yes      |Yes      |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |Full Query             |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |       |Yes      |Yes      |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |Selective Query        |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |       |Yes      |Yes      |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |List Sizes             |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |       |Yes      |Yes      |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |List Images            |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |       |Yes      |Yes      |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |List Locations         |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |       |Yes      |Yes      |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |create                 |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |Yes    |Yes      |Yes      |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |destroy                |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |       |Yes      |Yes      |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+-------+---------+---------+------+
+    |                       |AWS     |CloudStack|Digital|EC2|GoGrid|JoyEnt|Linode|OpenStack|Parallels|Rackspace|Saltify|Vagrant|Softlayer|Softlayer|Aliyun|
+    |                       |(Legacy)|          |Ocean  |   |      |      |      |         |         |(Legacy) |       |       |         |Hardware |      |
+    +=======================+========+==========+=======+===+======+======+======+=========+=========+=========+=======+=======+=========+=========+======+
+    |Query                  |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |[1]    |[1]    |Yes      |Yes      |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+-------+---------+---------+------+
+    |Full Query             |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |[1]    |[1]    |Yes      |Yes      |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+-------+---------+---------+------+
+    |Selective Query        |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |[1]    |[1]    |Yes      |Yes      |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+-------+---------+---------+------+
+    |List Sizes             |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |[2]    |[2]    |Yes      |Yes      |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+-------+---------+---------+------+
+    |List Images            |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |Yes    |Yes    |Yes      |Yes      |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+-------+---------+---------+------+
+    |List Locations         |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |[2]    |[2]    |Yes      |Yes      |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+-------+---------+---------+------+
+    |create                 |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |Yes    |[1]    |Yes      |Yes      |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+-------+---------+---------+------+
+    |destroy                |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |[1]    |[1]    |Yes      |Yes      |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+-------+---------+---------+------+
+
+[1] Yes, if salt-api is enabled.
+
+[2] Always returns `{}`.
 
 Actions
 =======
@@ -70,46 +74,46 @@ instance name to be passed in. For example:
 
 .. container:: scrollable
 
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |Actions                |AWS     |CloudStack|Digital|EC2|GoGrid|JoyEnt|Linode|OpenStack|Parallels|Rackspace|Saltify|Softlayer|Softlayer|Aliyun|
-    |                       |(Legacy)|          |Ocean  |   |      |      |      |         |         |(Legacy) |       |         |Hardware |      |
-    +=======================+========+==========+=======+===+======+======+======+=========+=========+=========+=======+=========+=========+======+
-    |attach_volume          |        |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |create_attach_volumes  |Yes     |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |del_tags               |Yes     |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |delvol_on_destroy      |        |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |detach_volume          |        |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |disable_term_protect   |Yes     |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |enable_term_protect    |Yes     |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |get_tags               |Yes     |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |keepvol_on_destroy     |        |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |list_keypairs          |        |          |Yes    |   |      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |rename                 |Yes     |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |set_tags               |Yes     |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |show_delvol_on_destroy |        |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |show_instance          |        |          |Yes    |Yes|      |      |Yes   |         |Yes      |         |       |Yes      |Yes      |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |show_term_protect      |        |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |start                  |Yes     |          |       |Yes|      |Yes   |Yes   |         |Yes      |         |       |         |         |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |stop                   |Yes     |          |       |Yes|      |Yes   |Yes   |         |Yes      |         |       |         |         |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |take_action            |        |          |       |   |      |Yes   |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |Actions                |AWS     |CloudStack|Digital|EC2|GoGrid|JoyEnt|Linode|OpenStack|Parallels|Rackspace|Saltify&|Softlayer|Softlayer|Aliyun|
+    |                       |(Legacy)|          |Ocean  |   |      |      |      |         |         |(Legacy) | Vagrant|         |Hardware |      |
+    +=======================+========+==========+=======+===+======+======+======+=========+=========+=========+========+=========+=========+======+
+    |attach_volume          |        |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |create_attach_volumes  |Yes     |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |del_tags               |Yes     |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |delvol_on_destroy      |        |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |detach_volume          |        |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |disable_term_protect   |Yes     |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |enable_term_protect    |Yes     |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |get_tags               |Yes     |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |keepvol_on_destroy     |        |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |list_keypairs          |        |          |Yes    |   |      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |rename                 |Yes     |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |set_tags               |Yes     |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |show_delvol_on_destroy |        |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |show_instance          |        |          |Yes    |Yes|      |      |Yes   |         |Yes      |         |        |Yes      |Yes      |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |show_term_protect      |        |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |start                  |Yes     |          |       |Yes|      |Yes   |Yes   |         |Yes      |         |        |         |         |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |stop                   |Yes     |          |       |Yes|      |Yes   |Yes   |         |Yes      |         |        |         |         |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |take_action            |        |          |       |   |      |Yes   |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
 
 Functions
 =========
@@ -122,81 +126,83 @@ require the name of the provider to be passed in. For example:
 
 .. container:: scrollable
 
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |Functions              |AWS     |CloudStack|Digital|EC2|GoGrid|JoyEnt|Linode|OpenStack|Parallels|Rackspace|Saltify|Softlayer|Softlayer|Aliyun|
-    |                       |(Legacy)|          |Ocean  |   |      |      |      |         |         |(Legacy) |       |         |Hardware |      |
-    +=======================+========+==========+=======+===+======+======+======+=========+=========+=========+=======+=========+=========+======+
-    |block_device_mappings  |Yes     |          |       |   |      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |create_keypair         |        |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |create_volume          |        |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |delete_key             |        |          |       |   |      |Yes   |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |delete_keypair         |        |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |delete_volume          |        |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |get_image              |        |          |Yes    |   |      |Yes   |      |         |Yes      |         |       |         |         |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |get_ip                 |        |Yes       |       |   |      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |get_key                |        |Yes       |       |   |      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |get_keyid              |        |          |Yes    |   |      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |get_keypair            |        |Yes       |       |   |      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |get_networkid          |        |Yes       |       |   |      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |get_node               |        |          |       |   |      |Yes   |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |get_password           |        |Yes       |       |   |      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |get_size               |        |          |Yes    |   |      |Yes   |      |         |         |         |       |         |         |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |get_spot_config        |        |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |get_subnetid           |        |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |iam_profile            |Yes     |          |       |Yes|      |      |      |         |         |         |       |         |         |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |import_key             |        |          |       |   |      |Yes   |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |key_list               |        |          |       |   |      |Yes   |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |keyname                |Yes     |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |list_availability_zones|        |          |       |Yes|      |      |      |         |         |         |       |         |         |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |list_custom_images     |        |          |       |   |      |      |      |         |         |         |       |Yes      |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |list_keys              |        |          |       |   |      |Yes   |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |list_nodes             |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |Yes    |Yes      |Yes      |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |list_nodes_full        |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |Yes    |Yes      |Yes      |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |list_nodes_select      |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |Yes    |Yes      |Yes      |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |list_vlans             |        |          |       |   |      |      |      |         |         |         |       |Yes      |Yes      |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |rackconnect            |        |          |       |   |      |      |      |Yes      |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |reboot                 |        |          |       |Yes|      |Yes   |      |         |         |         |       |         |         |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |reformat_node          |        |          |       |   |      |Yes   |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |securitygroup          |Yes     |          |       |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |securitygroupid        |        |          |       |Yes|      |      |      |         |         |         |       |         |         |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |show_image             |        |          |       |Yes|      |      |      |         |Yes      |         |       |         |         |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |show_key               |        |          |       |   |      |Yes   |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |show_keypair           |        |          |Yes    |Yes|      |      |      |         |         |         |       |         |         |      |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
-    |show_volume            |        |          |       |Yes|      |      |      |         |         |         |       |         |         |Yes   |
-    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+-------+---------+---------+------+
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |Functions              |AWS     |CloudStack|Digital|EC2|GoGrid|JoyEnt|Linode|OpenStack|Parallels|Rackspace|Saltify&|Softlayer|Softlayer|Aliyun|
+    |                       |(Legacy)|          |Ocean  |   |      |      |      |         |         |(Legacy) | Vagrant|         |Hardware |      |
+    +=======================+========+==========+=======+===+======+======+======+=========+=========+=========+========+=========+=========+======+
+    |block_device_mappings  |Yes     |          |       |   |      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |create_keypair         |        |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |create_volume          |        |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |delete_key             |        |          |       |   |      |Yes   |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |delete_keypair         |        |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |delete_volume          |        |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |get_image              |        |          |Yes    |   |      |Yes   |      |         |Yes      |         |        |         |         |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |get_ip                 |        |Yes       |       |   |      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |get_key                |        |Yes       |       |   |      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |get_keyid              |        |          |Yes    |   |      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |get_keypair            |        |Yes       |       |   |      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |get_networkid          |        |Yes       |       |   |      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |get_node               |        |          |       |   |      |Yes   |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |get_password           |        |Yes       |       |   |      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |get_size               |        |          |Yes    |   |      |Yes   |      |         |         |         |        |         |         |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |get_spot_config        |        |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |get_subnetid           |        |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |iam_profile            |Yes     |          |       |Yes|      |      |      |         |         |         |        |         |         |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |import_key             |        |          |       |   |      |Yes   |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |key_list               |        |          |       |   |      |Yes   |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |keyname                |Yes     |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |list_availability_zones|        |          |       |Yes|      |      |      |         |         |         |        |         |         |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |list_custom_images     |        |          |       |   |      |      |      |         |         |         |        |Yes      |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |list_keys              |        |          |       |   |      |Yes   |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |list_nodes             |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |Yes     |Yes      |Yes      |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |list_nodes_full        |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |Yes     |Yes      |Yes      |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |list_nodes_select      |Yes     |Yes       |Yes    |Yes|Yes   |Yes   |Yes   |Yes      |Yes      |Yes      |Yes     |Yes      |Yes      |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |list_vlans             |        |          |       |   |      |      |      |         |         |         |        |Yes      |Yes      |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |rackconnect            |        |          |       |   |      |      |      |Yes      |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |reboot                 |        |          |       |Yes|      |Yes   |      |         |         |         |[1]     |         |         |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |reformat_node          |        |          |       |   |      |Yes   |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |securitygroup          |Yes     |          |       |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |securitygroupid        |        |          |       |Yes|      |      |      |         |         |         |        |         |         |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |show_image             |        |          |       |Yes|      |      |      |         |Yes      |         |        |         |         |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |show_key               |        |          |       |   |      |Yes   |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |show_keypair           |        |          |Yes    |Yes|      |      |      |         |         |         |        |         |         |      |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+    |show_volume            |        |          |       |Yes|      |      |      |         |         |         |        |         |         |Yes   |
+    +-----------------------+--------+----------+-------+---+------+------+------+---------+---------+---------+--------+---------+---------+------+
+
+[1] Yes, if salt-api is enabled.

doc/topics/cloud/index.rst

@@ -119,6 +119,7 @@ Cloud Provider Specifics
         Getting Started With Libvirt <libvirt>
         Getting Started With Linode <linode>
         Getting Started With LXC <lxc>
+        Getting Started With OneAndOne <oneandone>
         Getting Started With OpenNebula <opennebula>
         Getting Started With OpenStack <openstack>
         Getting Started With Parallels <parallels>
@@ -128,9 +129,11 @@ Cloud Provider Specifics
         Getting Started With Scaleway <scaleway>
         Getting Started With Saltify <saltify>
         Getting Started With SoftLayer <softlayer>
+        Getting Started With Vagrant <vagrant>
         Getting Started With Vexxhost <vexxhost>
         Getting Started With Virtualbox <virtualbox>
         Getting Started With VMware <vmware>
+        Getting Started With Xen <xen>
 
 
 Miscellaneous Options

doc/topics/cloud/libvirt.rst

@@ -8,10 +8,14 @@ libvirt with qemu-kvm.
 
 http://www.libvirt.org/
 
-Dependencies
+Host Dependencies
 ============
 * libvirt >= 1.2.18 (older might work)
 
+Salt-Cloud Dependencies
+============
+* libvirt-python
+
 Provider Configuration
 ======================
 
@@ -32,6 +36,8 @@ Set up the provider cloud configuration file at ``/etc/salt/cloud.providers`` or
     local-kvm:
       driver: libvirt
       url: qemu:///system
+      # work around flag for XML validation errors while cloning
+      validate_xml: no
 
 Cloud Profiles
 ==============

doc/topics/cloud/misc.rst

@@ -386,3 +386,42 @@ script, a cloud profile using ``file_map`` might look like:
       file_map:
         /local/path/to/custom/script: /remote/path/to/use/custom/script
         /local/path/to/package: /remote/path/to/store/package
+
+Running Pre-Flight Commands
+===========================
+
+.. versionadded:: Oxygen
+
+To execute specified preflight shell commands on a VM before the deploy script is
+run, use the ``preflight_cmds`` option. These must be defined as a list in a cloud
+configuration file. For example:
+
+.. code-block:: yaml
+
+       my-cloud-profile:
+         provider: linode-config
+         image: Ubuntu 16.04 LTS
+         size: Linode 2048
+         preflight_cmds:
+           - whoami
+           - echo 'hello world!'
+
+These commands will run in sequence **before** the bootstrap script is executed.
+
+Force Minion Config
+===================
+
+.. versionadded:: Oxygen
+
+The ``force_minion_config`` option requests the bootstrap process to overwrite
+an existing minion configuration file and public/private key files.
+Default: False
+
+This might be important for drivers (such as ``saltify``) which are expected to
+take over a connection from a former salt master.
+
+.. code-block:: yaml
+
+    my_saltify_provider:
+      driver: saltify
+      force_minion_config: true