Merge commit '15f5ae7454411c9a31799d256093b8ebe0f0b52b' into develop

* commit '15f5ae7454411c9a31799d256093b8ebe0f0b52b': (194 commits) Consul SDB driver Add broadcast_change function from 2016.3 from saltstack#30800 Fixed zeromq ReqMessageClient destroy Keep context through state execution from the module on reload. Lint fixes for merge-forward Lint Pylint fix for ec2 strip whitespace from pillar keys looked up in consul Fix s3 test for new kms_keyid parameter/return Fixed zeromq ReqMessageClient destroy Keep context through state execution from the module on reload. Fix locale generation on Ubuntu Create file option . Allow control of opennebula vms via dns add 2015.8.7 release notes Fix some lint Add release notes remove set_key that was missed in cherry pick Fix some lint Add additional error information ... # Conflicts: # doc/ref/index.rst # doc/topics/releases/2015.8.4.rst # doc/topics/releases/2015.8.5.rst # doc/topics/tutorials/states_pt5.rst # salt/config/__init__.py # salt/modules/boto_dynamodb.py # salt/modules/boto_ec2.py # salt/modules/boto_elasticache.py # salt/modules/boto_elb.py # salt/modules/boto_iam.py # salt/modules/boto_rds.py # salt/modules/boto_sns.py # salt/modules/boto_sqs.py # salt/modules/dracr.py # salt/modules/git.py # salt/modules/mine.py # salt/modules/systemd.py # salt/modules/win_pkg.py # salt/modules/yumpkg.py # salt/pillar/__init__.py # salt/states/git.py # salt/states/rabbitmq_vhost.py # salt/states/saltmod.py # tests/unit/states/rabbitmq_vhost_test.py
gitebra · Feb 16, 2016 · 503b4b6 · 503b4b6
2 parents 342c2de + 15f5ae7
commit 503b4b6
Show file tree

Hide file tree

Showing 322 changed files with 4,646 additions and 3,348 deletions.
diff --git a/README.rst b/README.rst
@@ -2,67 +2,108 @@
 What is SaltStack?
 ==================
 
-Salt is a new approach to infrastructure management. Easy enough to get
-running in minutes, scalable enough to manage tens of thousands of servers,
-and fast enough to communicate with them in *seconds*.
-
-Salt delivers a dynamic communication bus for infrastructures that can be used
-for orchestration, remote execution, configuration management and much more.
+SaltStack makes software for complex systems management at scale.
+SaltStack is the company that created and maintains the Salt Open
+project and develops and sells SaltStack Enterprise software, services
+and support. Easy enough to get running in minutes, scalable enough to
+manage tens of thousands of servers, and fast enough to communicate with
+them in *seconds*.
+
+Salt is a new approach to infrastructure management built on a dynamic
+communication bus. Salt can be used for data-driven orchestration,
+remote execution for any infrastructure, configuration management for
+any app stack, and much more.
+
+Download Salt Open
+==================
 
-Documentation
-=============
+Salt Open is tested and packaged to run on CentOS, Debian, RHEL, Ubuntu,
+Windows. Download Salt Open and get started now.
 
-Installation instructions, getting started guides, and in-depth API
-documentation.
+`<https://repo.saltstack.com/>`_
 
-http://docs.saltstack.com
+`Installation Instructions <https://docs.saltstack.com/en/latest/topics/installation/index.html>`_
 
-IRC Chat
-========
+SaltStack Documentation
+=======================
 
-Join the vibrant, helpful and positive SaltStack chat room in Freenode at
-#salt. There is no need to introduce yourself, or ask permission to join in,
-just help and be helped! Make sure to wait for an answer, sometimes it may take
-a few moments for someone to reply.
+Installation instructions, getting started guides, and in-depth API
+documentation.
 
-http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83
+`<https://docs.saltstack.com/en/getstarted/>`_
 
-Salt Air
-========
+`<https://docs.saltstack.com/en/latest/>`_
 
-The SaltStack YouTube channel is filled with Salt videos and presentations.
-Watch the latest Salt Air episodes for updates from Thomas on development,
-catch tutorials, and stay on the cutting edge of Salt.
+Get SaltStack Support and Help
+==============================
 
-http://www.youtube.com/user/saltstack
+**IRC Chat** - Join the vibrant, helpful and positive SaltStack chat room in
+Freenode at #salt. There is no need to introduce yourself, or ask permission to
+join in, just help and be helped! Make sure to wait for an answer, sometimes it
+may take a few moments for someone to reply.
 
-Mailing List
-============
+  `<http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83>`_
 
-The SaltStack community users mailing list is hosted by Google groups. Anyone
-can post to ask questions about SaltStack products and anyone can help answer.
-Join the conversation!
+**Mailing List** - The SaltStack community users mailing list is hosted by
+Google groups. Anyone can post to ask questions about SaltStack products and
+anyone can help answer. Join the conversation!
 
-https://groups.google.com/forum/#!forum/salt-users
+  `<https://groups.google.com/forum/#!forum/salt-users>`_
 
 You may subscribe to the list without a Google account by emailing
 salt-users+subscribe@googlegroups.com and you may post to the list by emailing
 salt-users@googlegroups.com
 
-Developing Salt
-===============
-
-The Salt development team is welcoming, positive, and dedicated to helping
-people get new code and fixes into SaltStack projects. Log into GitHub and get
-started with one of the largest developer communities in the world. The following
-links should get you started:
+**Reporting Issues** - To report an issue with Salt, please follow the
+guidelines for filing bug reports:
+`<https://docs.saltstack.com/en/develop/topics/development/reporting_bugs.html>`_
 
-* https://github.com/saltstack
-* http://docs.saltstack.com/en/latest/topics/development/index.html
+**SaltStack Support** - If you need dedicated, prioritized support, please
+consider a SaltStack Support package that fits your needs:
+`<http://www.saltstack.com/support>`_
 
-Reporting Issues
+Engage SaltStack
 ================
 
-To report an issue with Salt, please follow the guidelines for filing bug reports:
+`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
+
+**SaltStack Training** - Get access to proprietary `SaltStack education
+offerings`_ through instructor-led training offered on-site, virtually or at
+SaltStack headquarters in Salt Lake City. SaltStack Enterprise training helps
+increase the value and effectiveness of SaltStack software for any customer and
+is a prerequisite for coveted `SaltStack Certified Engineer (SSCE)`_ status.
+SaltStack training is also available through several `SaltStack professional
+services`_ offerings.
+
+**Follow SaltStack on -**
+
+* YouTube - `<http://www.youtube.com/saltstack>`_
+* Twitter - `<http://www.twitter.com/saltstack>`_
+* Facebook - `<https://www.facebook.com/SaltStack/>`_
+* LinkedIn - `<https://www.linkedin.com/company/salt-stack-inc>`_
+* 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/
+.. _SaltStack education offerings: http://saltstack.com/training/
+.. _SaltStack Certified Engineer (SSCE): http://saltstack.com/certification/
+.. _SaltStack professional services: http://saltstack.com/services/
+
+Developing Salt
+===============
+
+The Salt development team is welcoming, positive, and dedicated to
+helping people get new code and fixes into SaltStack projects. Log into
+GitHub and get started with one of the largest developer communities in
+the world. The following links should get you started:
+
+* `<https://github.com/saltstack>`_
+* `<https://docs.saltstack.com/en/latest/topics/development/index.html>`_
 
-* http://docs.saltstack.com/en/develop/topics/development/reporting_bugs.html
diff --git a/conf/proxy b/conf/proxy
@@ -13,7 +13,7 @@
 #default_include: minion.d/*.conf
 
 # Backwards compatibility option for proxymodules created before 2015.8.2
-# This setting will default to 'False' in the Boron release
+# This setting will default to 'False' in the 2016.3.0 release
 # Setting this to True adds proxymodules to the __opts__ dictionary.
 # This breaks several Salt features (basically anything that serializes
 # __opts__ over the wire) but retains backwards compatibility.

diff --git a/doc/.tx/config b/doc/.tx/config
@@ -3014,12 +3014,6 @@ source_file = _build/locale/ref/clouds/all/index.pot
 source_lang = en
 source_name = ref/clouds/all/index.rst
 
-[salt.ref--clouds--all--salt_cloud_clouds_botocore_aws]
-file_filter = locale/<lang>/LC_MESSAGES/ref/clouds/all/salt.cloud.clouds.botocore_aws.po
-source_file = _build/locale/ref/clouds/all/salt.cloud.clouds.botocore_aws.pot
-source_lang = en
-source_name = ref/clouds/all/salt.cloud.clouds.botocore_aws.rst
-
 [salt.ref--clouds--all--salt_cloud_clouds_cloudstack]
 file_filter = locale/<lang>/LC_MESSAGES/ref/clouds/all/salt.cloud.clouds.cloudstack.po
 source_file = _build/locale/ref/clouds/all/salt.cloud.clouds.cloudstack.pot
@@ -3056,12 +3050,6 @@ source_file = _build/locale/ref/clouds/all/salt.cloud.clouds.joyent.pot
 source_lang = en
 source_name = ref/clouds/all/salt.cloud.clouds.joyent.rst
 
-[salt.ref--clouds--all--salt_cloud_clouds_libcloud_aws]
-file_filter = locale/<lang>/LC_MESSAGES/ref/clouds/all/salt.cloud.clouds.libcloud_aws.po
-source_file = _build/locale/ref/clouds/all/salt.cloud.clouds.libcloud_aws.pot
-source_lang = en
-source_name = ref/clouds/all/salt.cloud.clouds.libcloud_aws.rst
-
 [salt.ref--clouds--all--salt_cloud_clouds_linode]
 file_filter = locale/<lang>/LC_MESSAGES/ref/clouds/all/salt.cloud.clouds.linode.po
 source_file = _build/locale/ref/clouds/all/salt.cloud.clouds.linode.pot

diff --git a/doc/ref/clouds/all/index.rst b/doc/ref/clouds/all/index.rst
@@ -11,15 +11,13 @@ Full list of Salt Cloud modules
     :template: autosummary.rst.tmpl
 
     aliyun
-    botocore_aws
     cloudstack
     digital_ocean
     dimensiondata
     ec2
     gce
     gogrid
     joyent
-    libcloud_aws
     linode
     lxc
     msazure

diff --git a/doc/ref/clouds/all/salt.cloud.clouds.botocore_aws.rst b/doc/ref/clouds/all/salt.cloud.clouds.botocore_aws.rst
diff --git a/doc/ref/clouds/all/salt.cloud.clouds.libcloud_aws.rst b/doc/ref/clouds/all/salt.cloud.clouds.libcloud_aws.rst
diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst
@@ -216,7 +216,7 @@ The directory to store the pki authentication keys.
 ``extension_modules``
 ---------------------
 
-.. versionchanged:: Boron
+.. versionchanged:: 2016.3.0
     The default location for this directory has been moved. Prior to this
     version, the location was a directory named ``extmods`` in the Salt
     cachedir (on most platforms, ``/var/cache/salt/extmods``). It has been

diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst
@@ -393,7 +393,7 @@ to enable set grains_cache to ``True``.
 ``grains_deep_merge``
 ---------------------
 
-.. versionadded:: Boron
+.. versionadded:: 2016.3.0
 
 Default: ``False``
 

diff --git a/doc/ref/index.rst b/doc/ref/index.rst
@@ -1,39 +1,30 @@
-Reference
-=========
+=====================
+Salt Module Reference
+=====================
+
+This section contains a list of the Python modules that are used to extend the various subsystems within Salt.
+
 .. toctree::
+    :maxdepth: 1
     :glob:
 
-    auth/all/index
-    cli/index
-    clientacl
-    clients/index
-    clouds/all/index
-    configuration/*
-    configuration/logging/*
-    configuration/logging/handlers/index
-    file_server/index
-    file_server/all/index
-    grains/all/index
-    internals/index
-    modules/all/index
-    netapi/all/index
-    output/all/index
-    peer
-    pillar/index
-    pillar/all/index
-    proxy/all/index
-    renderers/index
-    returners/index
-    roster/all/index
-    runners/index
-    states/index
-    states/all/index
-    modules/index
-    tops/index
-    tops/all/index
-    wheel/all/index
-    beacons/all/index
-    engines/all/index
-    sdb/all/index
-    serializers/all/index
-    queues/all/index
+    ../ref/auth/all/index
+    ../ref/beacons/all/index
+    ../ref/engines/all/index
+    ../ref/file_server/all/index
+    ../ref/grains/all/index
+    ../ref/modules/all/index
+    ../ref/netapi/all/index
+    ../ref/output/all/index
+    ../ref/pillar/all/index
+    ../ref/proxy/all/index
+    ../ref/queues/all/index
+    ../ref/renderers/all/index
+    ../ref/returners/all/index
+    ../ref/roster/all/index
+    ../ref/runners/all/index
+    ../ref/sdb/all/index
+    ../ref/serializers/all/index
+    ../ref/states/all/index
+    ../ref/tops/all/index
+    ../ref/wheel/all/index
diff --git a/doc/ref/states/requisites.rst b/doc/ref/states/requisites.rst
@@ -101,9 +101,9 @@ first line in the stanza) or the ``- name`` parameter.
 Omitting state module in requisites
 -----------------------------------
 
-.. versionadded:: Boron
+.. versionadded:: 2016.3.0
 
-In version Boron, the state module name was made optional. If the state module
+In version 2016.3.0, the state module name was made optional. If the state module
 is omitted, all states matching the ID will be required, regardless of which
 module they are using.
 

diff --git a/doc/topics/blackout/index.rst b/doc/topics/blackout/index.rst
@@ -0,0 +1,26 @@
+.. _blackout:
+
+=============================
+Minion Blackout Configuration
+=============================
+
+.. versionadded:: 2016.3.0
+
+Salt supports minion blackouts. When a minion is in blackout mode, all remote
+execution commands are disabled. This allows production minions to be put
+"on hold", eliminating the risk of an untimely configuration change.
+
+Minion blackouts are configured via a special pillar key, ``minion_blackout``.
+If this key is set to ``True``, then the minion will reject all incoming
+commands, except for ``saltutil.refresh_pillar``. (The exception is important,
+so minions can be brought out of blackout mode)
+
+Salt also supports an explicit whitelist of additional functions that will be
+allowed during blackout. This is configured with the special pillar key
+``minion_blackout_whitelist``, which is formed as a list:
+
+.. code_block:: yaml
+
+    minion_blackout_whitelist:
+      - test.ping
+      - pillar.get
diff --git a/doc/topics/cloud/linode.rst b/doc/topics/cloud/linode.rst
@@ -184,17 +184,17 @@ and price. Required.
 
 assign_private_ip
 -----------------
-.. versionadded:: Boron
+.. versionadded:: 2016.3.0
 
 Assigns a private IP address to a Linode when set to True. Default is False.
 
 private_ip
 ----------
-Deprecated in favor of `assign_private_ip`_ in Salt Boron.
+Deprecated in favor of `assign_private_ip`_ in Salt 2016.3.0.
 
 ssh_interface
 -------------
-.. versionadded:: Boron
+.. versionadded:: 2016.3.0
 
 Specify whether to use a public or private IP for the deploy script. Valid options
 are:

diff --git a/doc/topics/cloud/softlayer.rst b/doc/topics/cloud/softlayer.rst
@@ -192,7 +192,7 @@ Name) which is a result of combining the ``domain`` configuration value and the
 Minion name specified either via the CLI or a map file rather than only using the
 short host name, or Minion ID. Default is False.
 
-.. versionadded:: Boron
+.. versionadded:: 2016.3.0
 
 For example, if the value of ``domain`` is ``example.com`` and a new VM was created
 via the CLI with ``salt-cloud -p base_softlayer_ubuntu my-vm``, the resulting

diff --git a/doc/topics/cloud/vmware.rst b/doc/topics/cloud/vmware.rst
@@ -246,7 +246,7 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or
             Enter the size of disk in GB
         thin_provision
             Specifies whether the disk should be thin provisioned or not. Default is ``thin_provision: False``.
-            .. versionadded:: Boron
+            .. versionadded:: 2016.3.0
         controller
             Specify the SCSI controller label to which this disk should be attached.
             This should be specified only when creating both the specified SCSI
@@ -527,7 +527,7 @@ Example of a minimal profile:
 Creating a VM
 =============
 
-.. versionadded:: Boron
+.. versionadded:: 2016.3.0
 
 Creating a VM from scratch means that more configuration has to be specified in the
 profile because there is no place to inherit configuration from.

diff --git a/doc/topics/configuration/index.rst b/doc/topics/configuration/index.rst
@@ -11,6 +11,7 @@ secure and troubleshoot, and how to perform many other administrative tasks.
     ../../ref/configuration/master
     ../../ref/configuration/minion
     ../../ref/configuration/examples
+    ../blackout/index
     ../eauth/access_control
     ../jobs/index
     ../jobs/job_cache