valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #31113 from rallytime/boron-changes

Browse Source 
Change all relevant Boron references to 2016.3.0
This commit is contained in:
Colton Myers 2016-02-10 17:20:51 -07:00
commit 5c33fc782a
231 changed files with 814 additions and 841 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/proxy
View File

@ -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.

2
doc/ref/configuration/master.rst
View File

@ -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

2
doc/ref/configuration/minion.rst
View File

@ -393,7 +393,7 @@ to enable set grains_cache to ``True``.
``grains_deep_merge``
---------------------
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Default: ``False``

4
doc/ref/states/requisites.rst
View File

@ -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.

6
doc/topics/cloud/linode.rst
View File

@ -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:

2
doc/topics/cloud/softlayer.rst
View File

@ -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

4
doc/topics/cloud/vmware.rst
View File

@ -240,7 +240,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
@ -521,7 +521,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.

2
doc/topics/development/conventions/documentation.rst
View File

@ -139,7 +139,7 @@ For changes to a function:
'''
Upper-case the given value
.. versionchanged:: Boron
.. versionchanged:: 2016.3.0
Added a flag to also strip whitespace from the string.
<...snip...>

2
doc/topics/proxyminion/index.rst
View File

@ -43,7 +43,7 @@ New in 2015.8.2
The `proxymodule` variable has been moved a new globally-injected variable
called `__proxy__`. A related configuration option called
`add_proxymodule_to_opts` has been added and defaults to `True`. In the next
major release, codenamed Boron, this variable will default to False.
major release, 2016.3.0, this variable will default to False.
In the meantime, proxies that functioned under 2015.8.0 and .1 should continue
to work under 2015.8.2. You should rework your proxy code to use `__proxy__` as

6
doc/topics/releases/boron.rst
View File

@ -1,8 +1,8 @@
:orphan:
===================================
Salt Release Notes - Codename Boron
===================================
============================================
Salt 2016.3.0 Release Notes - Codename Boron
============================================
Backwards-incompatible Changes
==============================

3
doc/topics/releases/version_numbers.rst
View File

@ -27,8 +27,9 @@ Assigned codenames:
- Helium: ``2014.7.0``
- Lithium: ``2015.5.0``
- Beryllium: ``2015.8.0``
- Boron: ``TBD``
- Boron: ``2016.3.0``
- Carbon: ``TBD``
- Nitrogen: ``TBD``
Example
-------

4
doc/topics/tutorials/esxi_proxy_minion.rst
View File

@ -145,10 +145,10 @@ will connect to.
.. note::
If you're running your ESXi Proxy Minion on version of Salt that is 2015.8.4
If you're running your ESXi Proxy Minion on version of Salt that is 2015.8.2
or newer, you also need to set ``add_proxymodule_to_opts: False`` in your
proxy config file. The need to specify this configuration will be removed with
Salt ``Boron``, the next major feature release. See the `New in 2015.8.2`_
Salt ``2016.3.0``, the next major feature release. See the `New in 2015.8.2`_
section of the Proxy Minion documentation for more information.
.. _New in 2015.8.2: https://docs.saltstack.com/en/latest/topics/proxyminion/index.html#new-in-2015-8-2

2
salt/beacons/adb.py
View File

@ -2,7 +2,7 @@
'''
Beacon to emit adb device state changes for Android devices
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
# Import Python libs

2
salt/beacons/glxinfo.py
View File

@ -2,7 +2,7 @@
'''
Beacon to emit when a display is available to a linux machine
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
# Import Python libs

2
salt/beacons/memusage.py
View File

@ -2,7 +2,7 @@
'''
Beacon to monitor memory usage.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:depends: python-psutil
'''

2
salt/beacons/pkg.py
View File

@ -2,7 +2,7 @@
'''
Watch for pkgs that have upgrades, then fire an event.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
# Import python libs

2
salt/client/mixins.py
View File

@ -329,7 +329,7 @@ class SyncClientMixin(object):
# kwargs using the old mechanism
if kwargs:
salt.utils.warn_until(
'Boron',
'Carbon',
'kwargs must be passed inside the low under "kwargs"'
)
else:

8
salt/client/ssh/wrapper/state.py
View File

@ -51,9 +51,9 @@ def sls(mods, saltenv='base', test=None, exclude=None, env=None, **kwargs):
__opts__['grains'] = __grains__
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -484,9 +484,9 @@ def show_sls(mods, saltenv='base', test=None, env=None, **kwargs):
__opts__['grains'] = __grains__
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env

12
salt/cloud/clouds/digital_ocean.py
View File

@ -937,7 +937,7 @@ def list_floating_ips(call=None):
'''
Return a list of the floating ips that are on the provider
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Examples:
@ -977,7 +977,7 @@ def show_floating_ip(kwargs=None, call=None):
'''
Show the details of a floating IP
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Examples:
@ -1010,7 +1010,7 @@ def create_floating_ip(kwargs=None, call=None):
'''
Create a new floating IP
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Examples:
@ -1052,7 +1052,7 @@ def delete_floating_ip(kwargs=None, call=None):
'''
Delete a floating IP
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Examples:
@ -1087,7 +1087,7 @@ def assign_floating_ip(kwargs=None, call=None):
'''
Assign a floating IP
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Examples:
@ -1120,7 +1120,7 @@ def unassign_floating_ip(kwargs=None, call=None):
'''
Unassign a floating IP
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Examples:

8
salt/cloud/clouds/linode.py
View File

@ -558,7 +558,7 @@ def create_config(kwargs=None, call=None):
data_disk_id
The Data Disk ID to be used for this config.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
kernel_id
The ID of the kernel to use for this configuration profile.
@ -679,7 +679,7 @@ def create_data_disk(vm_=None, linode_id=None, data_size=None):
r'''
Create a data disk for the linode (type is hardcoded to ext4 at the moment)
.. versionadded:: Boron
.. versionadded:: 2016.3.0
vm\_
The VM profile to create the data disk for.
@ -834,7 +834,7 @@ def get_data_disk_size(vm_, swap, linode_id):
'''
Return the size of of the data disk in MB
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
disk_size = get_linode(kwargs={'linode_id': linode_id})['TOTALHD']
root_disk_size = config.get_cloud_config_value(
@ -1044,7 +1044,7 @@ def get_data_disk(vm_):
'''
Return True if a data disk is requested
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
return config.get_cloud_config_value(
'allocate_data_disk', vm_, __opts__, default=False

12
salt/cloud/clouds/nova.py
View File

@ -1172,7 +1172,7 @@ def floating_ip_pool_list(call=None):
'''
List all floating IP pools
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
if call != 'function':
raise SaltCloudSystemExit(
@ -1187,7 +1187,7 @@ def floating_ip_list(call=None):
'''
List floating IPs
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
if call != 'function':
raise SaltCloudSystemExit(
@ -1202,7 +1202,7 @@ def floating_ip_create(kwargs, call=None):
'''
Allocate a floating IP
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
if call != 'function':
raise SaltCloudSystemExit(
@ -1221,7 +1221,7 @@ def floating_ip_delete(kwargs, call=None):
'''
De-allocate floating IP
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
if call != 'function':
raise SaltCloudSystemExit(
@ -1240,7 +1240,7 @@ def floating_ip_associate(name, kwargs, call=None):
'''
Associate a floating IP address to a server
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
if call != 'action':
raise SaltCloudSystemExit(
@ -1260,7 +1260,7 @@ def floating_ip_disassociate(name, kwargs, call=None):
'''
Disassociate a floating IP from a server
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
if call != 'action':
raise SaltCloudSystemExit(

126
salt/cloud/clouds/opennebula.py
View File

@ -197,7 +197,7 @@ def list_clusters(call=None):
'''
Returns a list of clusters in OpenNebula.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -225,7 +225,7 @@ def list_datastores(call=None):
'''
Returns a list of data stores on OpenNebula.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -253,7 +253,7 @@ def list_hosts(call=None):
'''
Returns a list of hosts on OpenNebula.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -331,7 +331,7 @@ def list_security_groups(call=None):
'''
Lists all security groups available to the user and the user's groups.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -359,7 +359,7 @@ def list_templates(call=None):
'''
Lists all templates available to the user and the user's groups.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -387,7 +387,7 @@ def list_vns(call=None):
'''
Lists all virtual networks available to the user and the user's groups.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -415,7 +415,7 @@ def reboot(name, call=None):
'''
Reboot a VM.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM to reboot.
@ -440,7 +440,7 @@ def start(name, call=None):
'''
Start a VM.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM to start.
@ -465,7 +465,7 @@ def stop(name, call=None):
'''
Stop a VM.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM to stop.
@ -490,7 +490,7 @@ def get_cluster_id(kwargs=None, call=None):
'''
Returns a cluster's ID from the given cluster name.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -526,7 +526,7 @@ def get_datastore_id(kwargs=None, call=None):
'''
Returns a data store's ID from the given data store name.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -562,7 +562,7 @@ def get_host_id(kwargs=None, call=None):
'''
Returns a host's ID from the given host name.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -617,7 +617,7 @@ def get_image_id(kwargs=None, call=None):
'''
Returns an image's ID from the given image name.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -679,7 +679,7 @@ def get_secgroup_id(kwargs=None, call=None):
'''
Returns a security group's ID from the given security group name.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -715,7 +715,7 @@ def get_template_id(kwargs=None, call=None):
'''
Returns a template's ID from the given template name.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -751,7 +751,7 @@ def get_vm_id(kwargs=None, call=None):
'''
Returns a virtual machine's ID from the given virtual machine's name.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -787,7 +787,7 @@ def get_vn_id(kwargs=None, call=None):
'''
Returns a virtual network's ID from the given virtual network's name.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -1048,7 +1048,7 @@ def image_allocate(call=None, kwargs=None):
'''
Allocates a new image in OpenNebula.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
path
The path to a file containing the template of the image to allocate.
@ -1135,7 +1135,7 @@ def image_clone(call=None, kwargs=None):
'''
Clones an existing image.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the new image.
@ -1204,7 +1204,7 @@ def image_delete(call=None, kwargs=None):
Deletes the given image from OpenNebula. Either a name or an image_id must
be supplied.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the image to delete. Can be used instead of ``image_id``.
@ -1263,7 +1263,7 @@ def image_info(call=None, kwargs=None):
Retrieves information for a given image. Either a name or an image_id must be
supplied.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the image for which to gather information. Can be used instead
@ -1320,7 +1320,7 @@ def image_persistent(call=None, kwargs=None):
'''
Sets the Image as persistent or not persistent.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the image to set. Can be used instead of ``image_id``.
@ -1389,7 +1389,7 @@ def image_snapshot_delete(call=None, kwargs=None):
'''
Deletes a snapshot from the image.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
image_id
The ID of the image from which to delete the snapshot. Can be used instead of
@ -1458,7 +1458,7 @@ def image_snapshot_revert(call=None, kwargs=None):
'''
Reverts an image state to a previous snapshot.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
image_id
The ID of the image to revert. Can be used instead of ``image_name``.
@ -1525,7 +1525,7 @@ def image_snapshot_flatten(call=None, kwargs=None):
'''
Flattens the snapshot of an image and discards others.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
image_id
The ID of the image. Can be used instead of ``image_name``.
@ -1593,7 +1593,7 @@ def image_update(call=None, kwargs=None):
'''
Replaces the image template contents.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
image_id
The ID of the image to update. Can be used instead of ``image_name``.
@ -1729,7 +1729,7 @@ def secgroup_allocate(call=None, kwargs=None):
'''
Allocates a new security group in OpenNebula.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
path
The path to a file containing the template of the security group. Syntax
@ -1792,7 +1792,7 @@ def secgroup_clone(call=None, kwargs=None):
'''
Clones an existing security group.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the new template.
@ -1863,7 +1863,7 @@ def secgroup_delete(call=None, kwargs=None):
Deletes the given security group from OpenNebula. Either a name or a secgroup_id
must be supplied.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the security group to delete. Can be used instead of
@ -1923,7 +1923,7 @@ def secgroup_info(call=None, kwargs=None):
Retrieves information for the given security group. Either a name or a
secgroup_id must be supplied.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the security group for which to gather information. Can be
@ -1980,7 +1980,7 @@ def secgroup_update(call=None, kwargs=None):
'''
Replaces the security group template contents.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
secgroup_id
The ID of the security group to update. Can be used instead of
@ -2091,7 +2091,7 @@ def template_allocate(call=None, kwargs=None):
'''
Allocates a new template in OpenNebula.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
path
The path to a file containing the elements of the template to be allocated.
@ -2156,7 +2156,7 @@ def template_clone(call=None, kwargs=None):
'''
Clones an existing virtual machine template.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the new template.
@ -2226,7 +2226,7 @@ def template_delete(call=None, kwargs=None):
Deletes the given template from OpenNebula. Either a name or a template_id must
be supplied.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the template to delete. Can be used instead of ``template_id``.
@ -2284,7 +2284,7 @@ def template_instantiate(call=None, kwargs=None):
'''
Instantiates a new virtual machine from a template.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
.. note::
``template_instantiate`` creates a VM on OpenNebula from a template, but it
@ -2359,7 +2359,7 @@ def template_update(call=None, kwargs=None):
'''
Replaces the template contents.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
template_id
The ID of the template to update. Can be used instead of ``template_name``.
@ -2470,7 +2470,7 @@ def vm_action(name, kwargs=None, call=None):
'''
Submits an action to be performed on a given virtual machine.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM to action.
@ -2535,7 +2535,7 @@ def vm_allocate(call=None, kwargs=None):
'''
Allocates a new virtual machine in OpenNebula.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
path
The path to a file defining the template of the VM to allocate.
@ -2602,7 +2602,7 @@ def vm_attach(name, kwargs=None, call=None):
'''
Attaches a new disk to the given virtual machine.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM for which to attach the new disk.
@ -2668,7 +2668,7 @@ def vm_attach_nic(name, kwargs=None, call=None):
'''
Attaches a new network interface to the given virtual machine.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM for which to attach the new network interface.
@ -2734,7 +2734,7 @@ def vm_deploy(name, kwargs=None, call=None):
'''
Initiates the instance of the given VM on the target host.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM to deploy.
@ -2833,7 +2833,7 @@ def vm_detach(name, kwargs=None, call=None):
'''
Detaches a disk from a virtual machine.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM from which to detach the disk.
@ -2880,7 +2880,7 @@ def vm_detach_nic(name, kwargs=None, call=None):
'''
Detaches a disk from a virtual machine.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM from which to detach the network interface.
@ -2927,7 +2927,7 @@ def vm_disk_save(name, kwargs=None, call=None):
'''
Sets the disk to be saved in the given image.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM containing the disk to save.
@ -2997,7 +2997,7 @@ def vm_disk_snapshot_create(name, kwargs=None, call=None):
'''
Takes a new snapshot of the disk image.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM of which to take the snapshot.
@ -3053,7 +3053,7 @@ def vm_disk_snapshot_delete(name, kwargs=None, call=None):
'''
Deletes a disk snapshot based on the given VM and the disk_id.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM containing the snapshot to delete.
@ -3109,7 +3109,7 @@ def vm_disk_snapshot_revert(name, kwargs=None, call=None):
'''
Reverts a disk state to a previously taken snapshot.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM containing the snapshot.
@ -3165,7 +3165,7 @@ def vm_info(name, call=None):
'''
Retrieves information for a given virtual machine. A VM name must be supplied.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM for which to gather information.
@ -3199,7 +3199,7 @@ def vm_migrate(name, kwargs=None, call=None):
'''
Migrates the specified virtual machine to the specified target host.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM to migrate.
@ -3308,7 +3308,7 @@ def vm_monitoring(name, call=None):
contains the complete dictionary of the VM with the updated information returned
by the poll action.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM for which to gather monitoring records.
@ -3346,7 +3346,7 @@ def vm_resize(name, kwargs=None, call=None):
'''
Changes the capacity of the virtual machine.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM to resize.
@ -3420,7 +3420,7 @@ def vm_snapshot_create(vm_name, kwargs=None, call=None):
'''
Creates a new virtual machine snapshot from the provided VM.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
vm_name
The name of the VM from which to create the snapshot.
@ -3467,7 +3467,7 @@ def vm_snapshot_delete(vm_name, kwargs=None, call=None):
'''
Deletes a virtual machine snapshot from the provided VM.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
vm_name
The name of the VM from which to delete the snapshot.
@ -3514,7 +3514,7 @@ def vm_snapshot_revert(vm_name, kwargs=None, call=None):
'''
Reverts a virtual machine to a snapshot
.. versionadded:: Boron
.. versionadded:: 2016.3.0
vm_name
The name of the VM to revert.
@ -3561,7 +3561,7 @@ def vm_update(name, kwargs=None, call=None):
'''
Replaces the user template contents.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the VM to update.
@ -3647,7 +3647,7 @@ def vn_add_ar(call=None, kwargs=None):
'''
Adds address ranges to a given virtual network.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
vn_id
The ID of the virtual network to add the address range. Can be used
@ -3733,7 +3733,7 @@ def vn_allocate(call=None, kwargs=None):
'''
Allocates a new virtual network in OpenNebula.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
path
The path to a file containing the template of the virtual network to allocate.
@ -3817,7 +3817,7 @@ def vn_delete(call=None, kwargs=None):
Deletes the given virtual network from OpenNebula. Either a name or a vn_id must
be supplied.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the virtual network to delete. Can be used instead of ``vn_id``.
@ -3875,7 +3875,7 @@ def vn_free_ar(call=None, kwargs=None):
'''
Frees a reserved address range from a virtual network.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
vn_id
The ID of the virtual network from which to free an address range.
@ -3944,7 +3944,7 @@ def vn_hold(call=None, kwargs=None):
'''
Holds a virtual network lease as used.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
vn_id
The ID of the virtual network from which to hold the lease. Can be used
@ -4029,7 +4029,7 @@ def vn_info(call=None, kwargs=None):
'''
Retrieves information for the virtual network.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
The name of the virtual network for which to gather information. Can be
@ -4088,7 +4088,7 @@ def vn_release(call=None, kwargs=None):
'''
Releases a virtual network lease that was previously on hold.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
vn_id
The ID of the virtual network from which to release the lease. Can be
@ -4173,7 +4173,7 @@ def vn_reserve(call=None, kwargs=None):
'''
Reserve network addresses.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
vn_id
The ID of the virtual network from which to reserve addresses. Can be used

2
salt/cloud/clouds/softlayer_hw.py
View File

@ -657,7 +657,7 @@ def show_all_categories(call=None):
'''
Return a dict of all available categories on the cloud provider.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
if call == 'action':
raise SaltCloudSystemExit(

2
salt/cloud/clouds/vmware.py
View File

@ -475,7 +475,7 @@ def _add_new_ide_controller_helper(ide_controller_label, properties, bus_number)
'''
Helper function for adding new IDE controllers
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
random_key = randint(-200, -250)

2
salt/cloud/clouds/vultrpy.py
View File

@ -3,7 +3,7 @@
Vultr Cloud Module using python-vultr bindings
==============================================
.. versionadded:: Boron
.. versionadded:: 2016.3.0
The Vultr cloud module is used to control access to the Vultr VPS system.

2
salt/config/__init__.py
View File

@ -451,7 +451,7 @@ VALID_OPTS = {
# Add the proxymodule LazyLoader object to opts. This breaks many things
# but this was the default pre 2015.8.2. This should default to
# False in Boron
# False in 2016.3.0
'add_proxymodule_to_opts': bool,
'git_pillar_base': str,
'git_pillar_branch': str,

2
salt/engines/logentries.py
View File

@ -7,7 +7,7 @@ An engine that sends events to the Logentries logging service.
:depends: ssl, certifi
:platform: all
.. versionadded: Boron
.. versionadded: 2016.3.0
To enable this engine the master and/or minion will need the following
python libraries

2
salt/engines/redis_sentinel.py
View File

@ -3,7 +3,7 @@
An engine that reads messages from the redis sentinel pubsub and sends reactor
events based on the channels they are subscribed to.
.. versionadded: Boron
.. versionadded: 2016.3.0
:configuration:

2
salt/engines/slack.py
View File

@ -5,7 +5,7 @@ event bus. Alternatively Salt commands can be sent to the Salt master
via Slack by setting the control paramter to True and using command
prefaced with a !.
.. versionadded: Boron
.. versionadded: 2016.3.0
:configuration:

100
salt/fileclient.py
View File

@ -112,10 +112,10 @@ class Client(object):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -161,10 +161,10 @@ class Client(object):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -178,10 +178,10 @@ class Client(object):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -199,10 +199,10 @@ class Client(object):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -219,10 +219,10 @@ class Client(object):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -296,10 +296,10 @@ class Client(object):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -317,10 +317,10 @@ class Client(object):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -333,10 +333,10 @@ class Client(object):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -349,10 +349,10 @@ class Client(object):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -366,10 +366,10 @@ class Client(object):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -470,10 +470,10 @@ class Client(object):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -537,10 +537,10 @@ class Client(object):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -720,10 +720,10 @@ class Client(object):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -825,10 +825,10 @@ class LocalClient(Client):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -846,10 +846,10 @@ class LocalClient(Client):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -874,10 +874,10 @@ class LocalClient(Client):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -901,10 +901,10 @@ class LocalClient(Client):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -928,10 +928,10 @@ class LocalClient(Client):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -965,10 +965,10 @@ class LocalClient(Client):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -1056,10 +1056,10 @@ class RemoteClient(Client):
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -1191,10 +1191,10 @@ class RemoteClient(Client):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -1211,10 +1211,10 @@ class RemoteClient(Client):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -1230,10 +1230,10 @@ class RemoteClient(Client):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -1260,10 +1260,10 @@ class RemoteClient(Client):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -1293,10 +1293,10 @@ class RemoteClient(Client):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env

28
salt/fileserver/__init__.py
View File

@ -507,10 +507,10 @@ class Fileserver(object):
kwargs[args[0]] = args[1]
if 'env' in kwargs:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
saltenv = kwargs.pop('env')
elif 'saltenv' in kwargs:
@ -535,10 +535,10 @@ class Fileserver(object):
'dest': ''}
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
load['saltenv'] = load.pop('env')
@ -561,10 +561,10 @@ class Fileserver(object):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
load['saltenv'] = load.pop('env')
@ -588,10 +588,10 @@ class Fileserver(object):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
load['saltenv'] = load.pop('env')
@ -619,10 +619,10 @@ class Fileserver(object):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
load['saltenv'] = load.pop('env')
@ -650,10 +650,10 @@ class Fileserver(object):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
load['saltenv'] = load.pop('env')
@ -681,10 +681,10 @@ class Fileserver(object):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
load['saltenv'] = load.pop('env')

8
salt/fileserver/azurefs.py
View File

@ -75,9 +75,9 @@ def find_file(path, saltenv='base', env=None, **kwargs):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -115,9 +115,9 @@ def serve_file(load, fnd):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')

20
salt/fileserver/hgfs.py
View File

@ -699,9 +699,9 @@ def serve_file(load, fnd):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')
@ -729,9 +729,9 @@ def file_hash(load, fnd):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')
@ -762,9 +762,9 @@ def _file_lists(load, form):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')
@ -809,9 +809,9 @@ def _get_file_list(load):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')
@ -853,9 +853,9 @@ def _get_dir_list(load):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')

12
salt/fileserver/minionfs.py
View File

@ -156,9 +156,9 @@ def file_hash(load, fnd):
ret = {}
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')
@ -225,9 +225,9 @@ def file_list(load):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')
@ -308,9 +308,9 @@ def dir_list(load):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')

20
salt/fileserver/roots.py
View File

@ -37,9 +37,9 @@ def find_file(path, saltenv='base', env=None, **kwargs):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -89,9 +89,9 @@ def serve_file(load, fnd):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')
@ -176,9 +176,9 @@ def file_hash(load, fnd):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')
@ -255,9 +255,9 @@ def _file_lists(load, form):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')
if load['saltenv'] not in __opts__['file_roots']:
@ -351,9 +351,9 @@ def symlink_list(load):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')

20
salt/fileserver/s3fs.py
View File

@ -125,9 +125,9 @@ def find_file(path, saltenv='base', env=None, **kwargs):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -167,9 +167,9 @@ def file_hash(load, fnd):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')
@ -199,9 +199,9 @@ def serve_file(load, fnd):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')
@ -240,9 +240,9 @@ def file_list(load):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')
@ -280,9 +280,9 @@ def dir_list(load):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')

12
salt/fileserver/svnfs.py
View File

@ -593,9 +593,9 @@ def serve_file(load, fnd):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')
@ -623,9 +623,9 @@ def file_hash(load, fnd):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')
@ -680,9 +680,9 @@ def _file_lists(load, form):
'''
if 'env' in load:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
load['saltenv'] = load.pop('env')

2
salt/grains/core.py
View File

@ -1706,7 +1706,7 @@ def dns():
'''
Parse the resolver configuration file
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
if salt.utils.is_windows() or 'proxyminion' in __opts__:

8
salt/minion.py
View File

@ -266,10 +266,10 @@ def parse_args_and_kwargs(func, args, data=None):
Wrap load_args_and_kwargs
'''
salt.utils.warn_until(
'Boron',
'Carbon',
'salt.minion.parse_args_and_kwargs() has been renamed to '
'salt.minion.load_args_and_kwargs(). Please change this function call '
'before the Boron release of Salt.'
'before the Carbon release of Salt.'
)
return load_args_and_kwargs(func, args, data=data)
@ -294,7 +294,7 @@ def load_args_and_kwargs(func, args, data=None, ignore_invalid=False):
_args.append(arg)
elif string_kwarg:
salt.utils.warn_until(
'Boron',
'Carbon',
'The list of function args and kwargs should be parsed '
'by salt.utils.args.parse_input() before calling '
'salt.minion.load_args_and_kwargs().'
@ -2770,7 +2770,7 @@ class ProxyMinion(Minion):
# functions here, and then force a grains sync in modules_refresh
self.opts['grains'] = salt.loader.grains(self.opts, force_refresh=True)
# Check config 'add_proxymodule_to_opts' Remove this in Boron.
# Check config 'add_proxymodule_to_opts' Remove this in Carbon.
if self.opts['add_proxymodule_to_opts']:
self.opts['proxymodule'] = self.proxy

12
salt/modules/augeas_cfg.py
View File

@ -144,7 +144,7 @@ def execute(context=None, lens=None, commands=(), load_path=None):
commands
The Augeas commands to execute
.. versionadded:: Boron
.. versionadded:: 2016.3.0
load_path
A colon-spearated list of directories that modules should be searched
@ -274,7 +274,7 @@ def get(path, value='', load_path=None):
value
The optional value to get
.. versionadded:: Boron
.. versionadded:: 2016.3.0
load_path
A colon-spearated list of directories that modules should be searched
@ -404,7 +404,7 @@ def match(path, value='', load_path=None):
value
The value to match on
.. versionadded:: Boron
.. versionadded:: 2016.3.0
load_path
A colon-spearated list of directories that modules should be searched
@ -443,7 +443,7 @@ def remove(path, load_path=None):
path
The path to remove
.. versionadded:: Boron
.. versionadded:: 2016.3.0
load_path
A colon-spearated list of directories that modules should be searched
@ -482,7 +482,7 @@ def ls(path, load_path=None): # pylint: disable=C0103
path
The path to list
.. versionadded:: Boron
.. versionadded:: 2016.3.0
load_path
A colon-spearated list of directories that modules should be searched
@ -533,7 +533,7 @@ def tree(path, load_path=None):
path
The base of the recursive listing
.. versionadded:: Boron
.. versionadded:: 2016.3.0
load_path
A colon-spearated list of directories that modules should be searched

2
salt/modules/bcache.py
View File

@ -12,7 +12,7 @@ https://www.kernel.org/doc/Documentation/bcache.txt
This module needs the bcache userspace tools to function.
.. versionadded: Boron
.. versionadded: 2016.3.0
'''
# Import python libs

10
salt/modules/blockdev.py
View File

@ -3,7 +3,7 @@
Module for managing block devices
.. versionadded:: 2014.7.0
.. deprecated:: Boron
.. deprecated:: Carbon
Merged to `disk` module
'''
@ -42,7 +42,7 @@ def tune(device, **kwargs):
'''
Set attributes for the specified device
.. deprecated:: Boron
.. deprecated:: Carbon
Use `disk.tune`
CLI Example:
@ -69,7 +69,7 @@ def wipe(device):
'''
Remove the filesystem information
.. deprecated:: Boron
.. deprecated:: Carbon
Use `disk.tune`
CLI Example:
@ -89,7 +89,7 @@ def dump(device, args=None):
'''
Return all contents of dumpe2fs for a specified device
.. deprecated:: Boron
.. deprecated:: Carbon
Use `disk.dump`
args
@ -200,7 +200,7 @@ def resize2fs(device):
'''
Resizes the filesystem.
.. deprecated:: Boron
.. deprecated:: Carbon
Use `disk.resize2fs`
CLI Example:

2
salt/modules/boto_cloudtrail.py
View File

@ -2,7 +2,7 @@
'''
Connection module for Amazon CloudTrail
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:configuration: This module accepts explicit Lambda credentials but can also
utilize IAM roles assigned to the instance trough Instance Profiles.

2
salt/modules/boto_datapipeline.py
View File

@ -2,7 +2,7 @@
'''
Connection module for Amazon Data Pipeline
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:depends: boto3
'''

28
salt/modules/boto_ec2.py
View File

@ -138,7 +138,7 @@ def get_all_eip_addresses(addresses=None, allocation_ids=None, region=None,
salt-call boto_ec2.get_all_eip_addresses
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
return [x.public_ip for x in _get_all_eip_addresses(addresses, allocation_ids, region,
key, keyid, profile)]
@ -159,7 +159,7 @@ def get_unassociated_eip_address(domain='standard', region=None, key=None,
salt-call boto_ec2.get_unassociated_eip_address
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
eip = None
for address in get_all_eip_addresses(region=region, key=key, keyid=keyid,
@ -210,7 +210,7 @@ def get_eip_address_info(addresses=None, allocation_ids=None, region=None, key=N
salt-call boto_ec2.get_eip_address_info addresses=52.4.2.15
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
if type(addresses) == (type('string')):
addresses = [addresses]
@ -247,7 +247,7 @@ def allocate_eip_address(domain=None, region=None, key=None, keyid=None, profile
salt-call boto_ec2.allocate_eip_address domain=vpc
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
if domain and domain != 'vpc':
raise SaltInvocationError('The only permitted value for the \'domain\' param is \'vpc\'.')
@ -287,7 +287,7 @@ def release_eip_address(public_ip=None, allocation_id=None, region=None, key=Non
salt myminion boto_ec2.release_eip_address allocation_id=eipalloc-ef382c8a
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
if not salt.utils.exactly_one((public_ip, allocation_id)):
raise SaltInvocationError('Exactly one (but not both) of \'public_ip\' '
@ -338,7 +338,7 @@ def associate_eip_address(instance_id=None, instance_name=None, public_ip=None,
salt myminion boto_ec2.associate_eip_address instance_name=bubba.ho.tep allocation_id=eipalloc-ef382c8a
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
if not salt.utils.exactly_one((instance_id, instance_name,
network_interface_id,
@ -404,7 +404,7 @@ def disassociate_eip_address(public_ip=None, association_id=None, region=None,
salt myminion boto_ec2.disassociate_eip_address association_id=eipassoc-e3ba2d16
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
@ -1087,7 +1087,7 @@ def get_network_interface_id(name, region=None, key=None, keyid=None,
'''
Get an Elastic Network Interface id from its name tag.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -1116,7 +1116,7 @@ def get_network_interface(name=None, network_interface_id=None, region=None,
'''
Get an Elastic Network Interface.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -1196,7 +1196,7 @@ def create_network_interface(name, subnet_id=None, subnet_name=None,
'''
Create an Elastic Network Interface.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -1258,7 +1258,7 @@ def delete_network_interface(
'''
Create an Elastic Network Interface.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -1295,7 +1295,7 @@ def attach_network_interface(device_index, name=None, network_interface_id=None,
'''
Attach an Elastic Network Interface.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -1351,7 +1351,7 @@ def detach_network_interface(
'''
Detach an Elastic Network Interface.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -1390,7 +1390,7 @@ def modify_network_interface_attribute(
'''
Modify an attribute of an Elastic Network Interface.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:

8
salt/modules/boto_elb.py
View File

@ -750,7 +750,7 @@ def create_policy(name, policy_name, policy_type, policy, region=None,
'''
Create an ELB policy.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI example:
@ -783,7 +783,7 @@ def delete_policy(name, policy_name, region=None, key=None, keyid=None,
'''
Delete an ELB policy.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI example:
@ -811,7 +811,7 @@ def set_listener_policy(name, port, policies=None, region=None, key=None,
'''
Set the policies of an ELB listener.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI example:
@ -864,7 +864,7 @@ def set_tags(name, tags, region=None, key=None, keyid=None, profile=None):
'''
Add the tags on an ELB
.. versionadded:: Boron
.. versionadded:: 2016.3.0
name
name of the ELB

10
salt/modules/boto_iam.py
View File

@ -411,7 +411,7 @@ def get_group_members(group_name, region=None, key=None, keyid=None, profile=Non
'''
Get group information.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -697,7 +697,7 @@ def delete_login_profile(user_name, region=None, key=None, keyid=None,
'''
Deletes a login profile for the specified user.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -730,7 +730,7 @@ def get_all_mfa_devices(user_name, region=None, key=None, keyid=None,
'''
Get all MFA devices associated with an IAM user.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -764,7 +764,7 @@ def deactivate_mfa_device(user_name, serial, region=None, key=None, keyid=None,
Deactivates the specified MFA device and removes it from association with
the user.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -1447,7 +1447,7 @@ def export_users(path_prefix='/', region=None, key=None, keyid=None,
Get all IAM user details. Produces results that can be used to create an
sls file.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:

2
salt/modules/boto_iot.py
View File

@ -2,7 +2,7 @@
'''
Connection module for Amazon IoT
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:configuration: This module accepts explicit Lambda credentials but can also
utilize IAM roles assigned to the instance trough Instance Profiles.

2
salt/modules/boto_lambda.py
View File

@ -2,7 +2,7 @@
'''
Connection module for Amazon Lambda
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:configuration: This module accepts explicit Lambda credentials but can also
utilize IAM roles assigned to the instance trough Instance Profiles.

2
salt/modules/boto_s3_bucket.py
View File

@ -2,7 +2,7 @@
'''
Connection module for Amazon S3 Buckets
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:configuration: This module accepts explicit Lambda credentials but can also
utilize IAM roles assigned to the instance trough Instance Profiles.

4
salt/modules/boto_secgroup.py
View File

@ -540,7 +540,7 @@ def set_tags(tags,
'''
sets tags on a security group
.. versionadded:: Boron
.. versionadded:: 2016.3.0
tags
a dict of key:value pair of tags to set on the security group
@ -604,7 +604,7 @@ def delete_tags(tags,
'''
deletes tags from a security group
.. versionadded:: Boron
.. versionadded:: 2016.3.0
tags
a list of tags to remove

20
salt/modules/boto_vpc.py
View File

@ -139,7 +139,7 @@ def check_vpc(vpc_id=None, vpc_name=None, region=None, key=None,
both vpc_id and vpc_name are None. Optionally raise a
CommandExecutionError if the VPC does not exist.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -1238,7 +1238,7 @@ def get_dhcp_options(dhcp_options_name=None, dhcp_options_id=None,
salt myminion boto_vpc.get_dhcp_options 'myfunnydhcpoptionsname'
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
if not any((dhcp_options_name, dhcp_options_id)):
raise SaltInvocationError('At least one of the following must be specified: '
@ -1323,12 +1323,12 @@ def associate_new_dhcp_options_to_vpc(vpc_id, domain_name=None, domain_name_serv
netbios_name_servers=None, netbios_node_type=None,
region=None, key=None, keyid=None, profile=None):
'''
..deprecated:: Boron
..deprecated:: Carbon
This function has been deprecated in favor of
:py:func:`boto_vpc.create_dhcp_options <salt.modules.boto_vpc.create_dhcp_options>`,
which now takes vpc_id or vpc_name as kwargs.
This function will be removed in the Salt Boron release.
This function will be removed in the Salt Carbon release.
Given valid DHCP options and a valid VPC id, create and associate the DHCP options record with the VPC.
@ -1340,9 +1340,9 @@ def associate_new_dhcp_options_to_vpc(vpc_id, domain_name=None, domain_name_serv
'''
salt.utils.warn_until(
'Boron',
'Carbon',
'Support for \'associate_new_dhcp_options_to_vpc\' has been deprecated '
'and will be removed in Salt Boron. Please use \'create_dhcp_options\' instead.'
'and will be removed in Salt Carbon. Please use \'create_dhcp_options\' instead.'
)
return create_dhcp_options(vpc_id=vpc_id, domain_name=domain_name,
@ -1553,12 +1553,12 @@ def associate_network_acl_to_subnet(network_acl_id=None, subnet_id=None,
def associate_new_network_acl_to_subnet(vpc_id, subnet_id, network_acl_name=None, tags=None,
region=None, key=None, keyid=None, profile=None):
'''
..deprecated:: Boron
..deprecated:: Carbon
This function has been deprecated in favor of
:py:func:`boto_vpc.create_network_acl <salt.modules.boto_vpc.create_network_acl>`,
which now takes subnet_id or subnet_name as kwargs.
This function will be removed in the Salt Boron release.
This function will be removed in the Salt Carbon release.
Given a vpc ID and a subnet ID, associates a new network act to a subnet.
@ -1572,9 +1572,9 @@ def associate_new_network_acl_to_subnet(vpc_id, subnet_id, network_acl_name=None
salt myminion boto_vpc.associate_new_network_acl_to_subnet 'vpc-6b1fe402' 'subnet-6a1fe403'
'''
salt.utils.warn_until(
'Boron',
'Carbon',
'Support for \'associate_new_network_acl_to_subnet\' has been deprecated '
'and will be removed in Salt Boron. Please use \'create_network_acl\' instead.'
'and will be removed in Salt Carbon. Please use \'create_network_acl\' instead.'
)
return create_network_acl(vpc_id=vpc_id, subnet_id=subnet_id,

26
salt/modules/cmdmod.py
View File

@ -697,7 +697,7 @@ def run(cmd,
:param str password: Windows only. Pass a password if you specify runas.
This parameter will be ignored for other OS's
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:param str shell: Shell to execute under. Defaults to the system default
shell.
@ -925,7 +925,7 @@ def shell(cmd,
:param str password: Windows only. Pass a password if you specify runas.
This parameter will be ignored for other OS's
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:param int shell: Shell to execute under. Defaults to the system default
shell.
@ -1109,7 +1109,7 @@ def run_stdout(cmd,
:param str password: Windows only. Pass a password if you specify runas.
This parameter will be ignored for other OS's
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:param str shell: Shell to execute under. Defaults to the system default shell.
@ -1290,7 +1290,7 @@ def run_stderr(cmd,
:param str password: Windows only. Pass a password if you specify runas.
This parameter will be ignored for other OS's
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:param str shell: Shell to execute under. Defaults to the system default
shell.
@ -1473,7 +1473,7 @@ def run_all(cmd,
:param str password: Windows only. Pass a password if you specify runas.
This parameter will be ignored for other OS's
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:param str shell: Shell to execute under. Defaults to the system default
shell.
@ -1664,7 +1664,7 @@ def retcode(cmd,
:param str password: Windows only. Pass a password if you specify runas.
This parameter will be ignored for other OS's
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:param str shell: Shell to execute under. Defaults to the system default
shell.
@ -1898,7 +1898,7 @@ def script(source,
:param str password: Windows only. Pass a password if you specify runas.
This parameter will be ignored for other OS's
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:param str shell: Shell to execute under. Defaults to the system default
shell.
@ -2000,9 +2000,9 @@ def script(source,
if isinstance(__env__, six.string_types):
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' not '
'\'__env__\'. This functionality will be removed in Salt Boron.'
'\'__env__\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = __env__
@ -2112,7 +2112,7 @@ def script_retcode(source,
:param str password: Windows only. Pass a password if you specify runas.
This parameter will be ignored for other OS's
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:param str shell: Shell to execute under. Defaults to the system default
shell.
@ -2595,7 +2595,7 @@ def powershell(cmd,
'''
Execute the passed PowerShell command and return the output as a string.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
.. warning ::
@ -2621,7 +2621,7 @@ def powershell(cmd,
:param str password: Windows only. Pass a password if you specify runas.
This parameter will be ignored for other OS's
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:param str shell: Shell to execute under. Defaults to the system default
shell.
@ -2756,7 +2756,7 @@ def run_bg(cmd,
saltenv='base',
**kwargs):
r'''
.. versionadded: Boron
.. versionadded: 2016.3.0
Execute the passed command in the background and return it's PID

66
salt/modules/cp.py
View File

@ -185,9 +185,9 @@ def get_file(path,
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -230,9 +230,9 @@ def get_template(path,
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -269,9 +269,9 @@ def get_dir(path, dest, saltenv='base', template=None, gzip=None, env=None, **kw
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -299,9 +299,9 @@ def get_url(path, dest, saltenv='base', env=None):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -325,9 +325,9 @@ def get_file_str(path, saltenv='base', env=None):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -351,9 +351,9 @@ def cache_file(path, saltenv='base', env=None):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -388,9 +388,9 @@ def cache_files(paths, saltenv='base', env=None):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -434,9 +434,9 @@ def cache_dir(path, saltenv='base', include_empty=False, include_pat=None,
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -459,9 +459,9 @@ def cache_master(saltenv='base', env=None):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -510,9 +510,9 @@ def list_states(saltenv='base', env=None):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -533,9 +533,9 @@ def list_master(saltenv='base', prefix='', env=None):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -556,9 +556,9 @@ def list_master_dirs(saltenv='base', prefix='', env=None):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -579,9 +579,9 @@ def list_master_symlinks(saltenv='base', prefix='', env=None):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -602,9 +602,9 @@ def list_minion(saltenv='base', env=None):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -626,9 +626,9 @@ def is_cached(path, saltenv='base', env=None):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -651,9 +651,9 @@ def hash_file(path, saltenv='base', env=None):
'''
if env is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt Boron.'
'not \'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env
@ -686,7 +686,7 @@ def push(path, keep_symlinks=False, upload_path=None, remove_source=False):
remove_source
Remove the source file on the minion
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:

12
salt/modules/data.py
View File

@ -106,7 +106,7 @@ def getval(key):
'''
Get a value from the minion datastore
.. deprecated:: Boron
.. deprecated:: Carbon
Use ``get`` instead
CLI Example:
@ -116,9 +116,9 @@ def getval(key):
salt '*' data.getval <key>
'''
salt.utils.warn_until(
'Boron',
'Carbon',
'Support for \'getval\' has been deprecated and will be removed '
'in Salt Boron. Please use \'get\' instead.'
'in Salt Carbon. Please use \'get\' instead.'
)
return get(key)
@ -127,7 +127,7 @@ def getvals(*keylist):
'''
Get values from the minion datastore
.. deprecated:: Boron
.. deprecated:: Carbon
Use ``get`` instead
CLI Example:
@ -137,9 +137,9 @@ def getvals(*keylist):
salt '*' data.getvals <key> [<key> ...]
'''
salt.utils.warn_until(
'Boron',
'Carbon',
'Support for \'getvals\' has been deprecated and will be removed '
'in Salt Boron. Please use \'get\' instead.'
'in Salt Carbon. Please use \'get\' instead.'
)
return get(keylist)

6
salt/modules/deb_apache.py
View File

@ -232,7 +232,7 @@ def a2dismod(mod):
def check_conf_enabled(conf):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Checks to see if the specific conf symlink is in /etc/apache2/conf-enabled.
@ -256,7 +256,7 @@ def check_conf_enabled(conf):
@salt.utils.decorators.which('a2enconf')
def a2enconf(conf):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Runs a2enconf for the given conf.
@ -293,7 +293,7 @@ def a2enconf(conf):
@salt.utils.decorators.which('a2disconf')
def a2disconf(conf):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Runs a2disconf for the given conf.

4
salt/modules/debconfmod.py
View File

@ -184,9 +184,9 @@ def set_file(path, saltenv='base', **kwargs):
'''
if '__env__' in kwargs:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' not '
'\'__env__\'. This functionality will be removed in Salt Boron.'
'\'__env__\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = kwargs['__env__']

8
salt/modules/disk.py
View File

@ -395,7 +395,7 @@ def hdparms(disks, args=None):
parse 'em into a nice dict
(which, considering hdparms output, is quite a hassle)
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
.. code-block:: bash
@ -479,7 +479,7 @@ def hpa(disks, size=None):
.. warning::
Setting the HPA might clobber your data, be very careful with this on active disks!
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -531,7 +531,7 @@ def smart_attributes(dev, attributes=None, values=None):
set (https://www.backblaze.com/blog/hard-drive-smart-stats/):
(5,187,188,197,198)
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -599,7 +599,7 @@ def iostat(interval=1, count=5, disks=None):
'''
Gather and return (averaged) IO stats.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:

2
salt/modules/dockercompose.py
View File

@ -3,7 +3,7 @@
'''
Module to import docker-compose via saltstack
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:maintainer: Jean Praloran <jeanpralo@gmail.com>
:maturity: new

12
salt/modules/dockerio.py
View File

@ -2173,10 +2173,10 @@ def _script(status,
if isinstance(env, six.string_types):
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -2274,10 +2274,10 @@ def script(container,
if isinstance(env, six.string_types):
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env
@ -2334,10 +2334,10 @@ def script_retcode(container,
if isinstance(env, six.string_types):
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'env\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = env

4
salt/modules/etcd_mod.py
View File

@ -103,7 +103,7 @@ def set_(key, value, profile=None, ttl=None, directory=False):
def update(fields, path='', profile=None):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Sets a dictionary of values in one call. Useful for large updates
in syndic environments. The dictionary can contain a mix of formats
@ -156,7 +156,7 @@ def update(fields, path='', profile=None):
def watch(key, recurse=False, profile=None, timeout=0, index=None):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Makes a best effort to watch for a key or tree change in etcd.
Returns a dict containing the new key value ( or None if the key was

2
salt/modules/ethtool.py
View File

@ -2,7 +2,7 @@
'''
Module for running ethtool command
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:codeauthor: Krzysztof Pawlowski <msciciel@msciciel.eu>
:maturity: new

4
salt/modules/file.py
View File

@ -3956,9 +3956,9 @@ def get_diff(
if isinstance(env, six.string_types):
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' not '
'\'env\'. This functionality will be removed in Salt Boron.'
'\'env\'. This functionality will be removed in Salt Carbon.'
)
# Backwards compatibility
saltenv = env

14
salt/modules/firewalld.py
View File

@ -639,7 +639,7 @@ def make_permanent():
'''
Make current runtime configuration permanent.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -654,7 +654,7 @@ def get_interfaces(zone):
'''
List interfaces bound to a zone
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -669,7 +669,7 @@ def add_interface(zone, interface):
'''
Bind an interface to a zone
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -687,7 +687,7 @@ def remove_interface(zone, interface):
'''
Remove an interface bound to a zone
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -705,7 +705,7 @@ def get_sources(zone):
'''
List sources bound to a zone
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -720,7 +720,7 @@ def add_source(zone, source):
'''
Bind a source to a zone
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -738,7 +738,7 @@ def remove_source(zone, source):
'''
Remove a source bound to a zone
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:

14
salt/modules/git.py
View File

@ -700,7 +700,7 @@ def clone(cwd,
Key can also be specified as a SaltStack file server URL, eg. salt://location/identity_file
.. versionadded:: Boron
.. versionadded:: 2016.3.0
https_user
Set HTTP Basic Auth username. Only accepted for HTTPS URLs.
@ -1396,7 +1396,7 @@ def fetch(cwd,
Key can also be specified as a SaltStack file server URL, eg. salt://location/identity_file
.. versionadded:: Boron
.. versionadded:: 2016.3.0
ignore_retcode : False
If ``True``, do not log an error to the minion log if the git command
@ -2040,7 +2040,7 @@ def ls_remote(cwd=None,
Key can also be specified as a SaltStack file server URL, eg. salt://location/identity_file
.. versionadded:: Boron
.. versionadded:: 2016.3.0
https_user
Set HTTP Basic Auth username. Only accepted for HTTPS URLs.
@ -2462,7 +2462,7 @@ def pull(cwd, opts='', user=None, identity=None, ignore_retcode=False):
Key can also be specified as a SaltStack file server URL, eg. salt://location/identity_file
.. versionadded:: Boron
.. versionadded:: 2016.3.0
ignore_retcode : False
If ``True``, do not log an error to the minion log if the git command
@ -2546,7 +2546,7 @@ def push(cwd,
Key can also be specified as a SaltStack file server URL, eg. salt://location/identity_file
.. versionadded:: Boron
.. versionadded:: 2016.3.0
ignore_retcode : False
If ``True``, do not log an error to the minion log if the git command
@ -2746,7 +2746,7 @@ def remote_refs(url,
Key can also be specified as a SaltStack file server URL, eg. salt://location/identity_file
.. versionadded:: Boron
.. versionadded:: 2016.3.0
https_user
Set HTTP Basic Auth username. Only accepted for HTTPS URLs.
@ -3322,7 +3322,7 @@ def submodule(cwd,
Key can also be specified as a SaltStack file server URL, eg. salt://location/identity_file
.. versionadded:: Boron
.. versionadded:: 2016.3.0
ignore_retcode : False
If ``True``, do not log an error to the minion log if the git command

2
salt/modules/github.py
View File

@ -2,7 +2,7 @@
'''
Module for interop with the Github v3 API
.. versionadded:: Boron.
.. versionadded:: 2016.3.0.
:depends: - PyGithub python module
:configuration: Configure this module by specifying the name of a configuration

12
salt/modules/glance.py
View File

@ -379,9 +379,9 @@ def image_show(id=None, name=None, profile=None): # pylint: disable=C0103
image.name, pformat(image)))
ret_details = {}
# I may want to use this code on Beryllium
# until we got Boron packages for Ubuntu
# until we got 2016.3.0 packages for Ubuntu
# so please keep this code until Carbon!
warn_until('Carbon', 'Starting with \'Boron\' image_show() '
warn_until('Carbon', 'Starting with \'2016.3.0\' image_show() '
'will stop wrapping the returned image in another '
'dictionary.')
if CUR_VER < BORON:
@ -413,9 +413,9 @@ def image_list(id=None, profile=None, name=None): # pylint: disable=C0103
# return False
#
# I may want to use this code on Beryllium
# until we got Boron packages for Ubuntu
# until we got 2016.3.0 packages for Ubuntu
# so please keep this code until Carbon!
warn_until('Carbon', 'Starting in \'Boron\' image_list() '
warn_until('Carbon', 'Starting in \'2016.3.0\' image_list() '
'will return a list of images instead of a dictionary '
'keyed with the images\' names.')
if CUR_VER < BORON:
@ -494,9 +494,9 @@ def image_update(id=None, name=None, profile=None, **kwargs): # pylint: disable
g_client = _auth(profile)
updated = g_client.images.update(image['id'], **to_update)
# I may want to use this code on Beryllium
# until we got Boron packages for Ubuntu
# until we got 2016.3.0 packages for Ubuntu
# so please keep this code until Carbon!
warn_until('Carbon', 'Starting with \'Boron\' image_update() '
warn_until('Carbon', 'Starting with \'2016.3.0\' image_update() '
'will stop wrapping the returned, updated image in '
'another dictionary.')
if CUR_VER < BORON:

2
salt/modules/grains.py
View File

@ -356,7 +356,7 @@ def remove(key, val, delimiter=DEFAULT_TARGET_DELIM):
You can now append values to a list in nested dictionary grains. If the
list doesn't exist at this level, it will be created.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:

6
salt/modules/hashutil.py
View File

@ -80,7 +80,7 @@ def base64_b64encode(instr):
Among other possible differences, the "modern" encoder does not include
newline ('\\n') characters in the encoded output.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -99,7 +99,7 @@ def base64_b64decode(instr):
'''
Decode a base64-encoded string using the "modern" Python interface
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -144,7 +144,7 @@ def base64_encodefile(fname):
'''
Read a file from the file system and return as a base64 encoded string
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Pillar example:

2
salt/modules/hosts.py
View File

@ -143,7 +143,7 @@ def set_host(ip, alias):
Set the host entry in the hosts file for the given ip, this will overwrite
any previous entry for the given ip
.. versionchanged:: Boron
.. versionchanged:: 2016.3.0
If ``alias`` does not include any host names (it is the empty
string or contains only whitespace), all entries for the given
IP address are removed.

2
salt/modules/infoblox.py
View File

@ -4,7 +4,7 @@ Module for managing Infoblox
Will look for pillar data infoblox:server, infoblox:user, infoblox:password if not passed to functions
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:depends:
- requests

2
salt/modules/jenkins.py
View File

@ -2,7 +2,7 @@
'''
Module for controlling Jenkins
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:configuration: This module can be used by either passing an api key and version
directly or by specifying both in a configuration profile in the salt

2
salt/modules/k8s.py
View File

@ -2,7 +2,7 @@
'''
Salt module to manage Kubernetes cluster
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Roadmap:

2
salt/modules/ldap3.py
View File

@ -3,7 +3,7 @@
Query and modify an LDAP database (alternative interface)
=========================================================
.. versionadded:: Boron
.. versionadded:: 2016.3.0
This is an alternative to the ``ldap`` interface provided by the
:py:mod:`ldapmod <salt.modules.ldapmod>` execution module.

18
salt/modules/lxc.py
View File

@ -561,7 +561,7 @@ def _get_profile(key, old_key, name, **kwargs):
'lxc.{1}:{0}'.format(name, old_key), None)
if profile_match is not None:
salt.utils.warn_until(
'Boron',
'Carbon',
'lxc.{1} has been deprecated, please configure LXC '
'container profiles under lxc.{0} instead'.format(
key, old_key))
@ -1326,7 +1326,7 @@ def init(name,
profile = get_container_profile(copy.deepcopy(profile))
if bool(nic) and nic is not _marker:
salt.utils.warn_until(
'Boron',
'Carbon',
'The \'nic\' argument to \'lxc.init\' has been deprecated, '
'please use \'network_profile\' instead.'
)
@ -1342,7 +1342,7 @@ def init(name,
pass
else:
salt.utils.warn_until(
'Boron',
'Carbon',
'The \'clone\' argument to \'lxc.init\' has been deprecated, '
'please use \'clone_from\' instead.'
)
@ -1385,8 +1385,8 @@ def init(name,
clone_from = select('clone_from')
if password and password_encrypted is None:
salt.utils.warn_until(
'Boron',
'Starting with the Boron release, passwords passed to the '
'Carbon',
'Starting with the Carbon release, passwords passed to the '
'\'lxc.init\' function will be assumed to be hashed, unless '
'password_encrypted=False. Please keep this in mind.'
)
@ -2434,7 +2434,7 @@ def start(name, **kwargs):
_ensure_exists(name, path=path)
if kwargs.get('restart', False):
salt.utils.warn_until(
'Boron',
'Carbon',
'The \'restart\' argument to \'lxc.start\' has been deprecated, '
'please use \'lxc.restart\' instead.'
)
@ -3732,7 +3732,7 @@ def run_cmd(name,
Use :mod:`lxc.run <salt.modules.lxc.run>` instead
'''
salt.utils.warn_until(
'Boron',
'Carbon',
'lxc.run_cmd has been deprecated, please use one of the lxc.run '
'functions (or lxc.retcode). See the documentation for more '
'information.'
@ -4568,12 +4568,12 @@ def reconfigure(name,
utsname
utsname of the container.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
rootfs
rootfs of the container.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
cpu
Select a random number of cpu cores and assign it to the cpuset, if the

4
salt/modules/mac_group.py
View File

@ -129,7 +129,7 @@ def deluser(group, name):
'''
Remove a user from the group
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:
@ -148,7 +148,7 @@ def members(name, members_list):
'''
Replaces members of the group with a provided list.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:

2
salt/modules/mac_power.py
View File

@ -2,7 +2,7 @@
'''
Module for editing power settings on Mac OS X
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
from __future__ import absolute_import

2
salt/modules/mac_service.py
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
'''
The service module for Mac OS X
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
from __future__ import absolute_import

2
salt/modules/mac_system.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
System module for sleeping, restarting, and shutting down the system on Mac OS
X.

6
salt/modules/mac_user.py
View File

@ -454,7 +454,7 @@ def rename(name, new_name):
def get_auto_login():
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Gets the current setting for Auto Login
@ -477,7 +477,7 @@ def get_auto_login():
def enable_auto_login(name):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Configures the machine to auto login with the specified user
@ -504,7 +504,7 @@ def enable_auto_login(name):
def disable_auto_login():
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Disables auto login on the machine

2
salt/modules/mdata.py
View File

@ -2,7 +2,7 @@
'''
Module for managaging metadata in SmartOS Zones
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:maintainer: Jorge Schrauwen <sjorge@blackdot.be>
:maturity: new

10
salt/modules/monit.py
View File

@ -162,7 +162,7 @@ def status(svc_name=''):
def reload_():
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Reload monit configuration
@ -178,7 +178,7 @@ def reload_():
def configtest():
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Test monit configuration syntax
@ -206,7 +206,7 @@ def configtest():
def version():
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Return version from monit -V
@ -224,7 +224,7 @@ def version():
def id_(reset=False):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Return monit unique id.
@ -252,7 +252,7 @@ def id_(reset=False):
def validate():
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Check all services

2
salt/modules/netaddress.py
View File

@ -2,7 +2,7 @@
'''
Module for getting information about network addresses.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:depends: netaddr
'''

2
salt/modules/network.py
View File

@ -840,7 +840,7 @@ def convert_cidr(cidr):
'''
returns the network and subnet mask of a cidr addr
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:

2
salt/modules/npm.py
View File

@ -106,7 +106,7 @@ def install(pkg=None,
silent
Whether or not to run NPM install with --silent flag.
.. versionadded:: Boron
.. versionadded:: 2016.3.0
dry_run
Whether or not to run NPM install with --dry-run flag.

2
salt/modules/opkg.py
View File

@ -2,7 +2,7 @@
'''
Support for Opkg
.. versionadded: Boron
.. versionadded: 2016.3.0
.. note::

2
salt/modules/pillar.py
View File

@ -313,7 +313,7 @@ def keys(key, delimiter=DEFAULT_TARGET_DELIM):
def file_exists(path, saltenv=None):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
This is a master-only function. Calling from the minion is not supported.

14
salt/modules/pip.py
View File

@ -562,15 +562,15 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914
# the `bin_env` argument and we'll take care of the rest.
if env and not bin_env:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing \'env\' to the pip module is deprecated. Use bin_env instead. '
'This functionality will be removed in Salt Boron.'
'This functionality will be removed in Salt Carbon.'
)
bin_env = env
if activate:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing \'activate\' to the pip module is deprecated. If '
'bin_env refers to a virtualenv, there is no need to activate '
'that virtualenv before using pip to install packages in it.'
@ -578,10 +578,10 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914
if isinstance(__env__, string_types):
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'__env__\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = __env__
@ -913,10 +913,10 @@ def uninstall(pkgs=None,
if isinstance(__env__, string_types):
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'__env__\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = __env__

4
salt/modules/pkg_resource.py
View File

@ -105,10 +105,10 @@ def parse_targets(name=None,
'''
if '__env__' in kwargs:
salt.utils.warn_until(
'Boron',
'Carbon',
'Passing a salt environment should be done using \'saltenv\' '
'not \'__env__\'. This functionality will be removed in Salt '
'Boron.'
'Carbon.'
)
# Backwards compatibility
saltenv = kwargs['__env__']

6
salt/modules/pkgin.py
View File

@ -128,7 +128,7 @@ def search(pkg_name):
def latest_version(*names, **kwargs):
'''
.. versionchanged: Boron
.. versionchanged: 2016.3.0
Return the latest version of the named package available for upgrade or
installation.
@ -235,7 +235,7 @@ def refresh_db():
def list_pkgs(versions_as_list=False, **kwargs):
'''
.. versionchanged: Boron
.. versionchanged: 2016.3.0
List the packages currently installed as a dict::
{'<package_name>': '<version>'}
@ -592,7 +592,7 @@ def file_list(package):
def file_dict(*packages):
'''
.. versionchanged: Boron
.. versionchanged: 2016.3.0
List the files that belong to a package.
CLI Examples:

20
salt/modules/postgres.py
View File

@ -2101,7 +2101,7 @@ def language_list(
password=None,
runas=None):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Return a list of languages in a database.
@ -2157,7 +2157,7 @@ def language_exists(
password=None,
runas=None):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Checks if language exists in a database.
@ -2206,7 +2206,7 @@ def language_create(name,
password=None,
runas=None):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Installs a language into a database
@ -2263,7 +2263,7 @@ def language_remove(name,
password=None,
runas=None):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Removes a language from a database
@ -2537,7 +2537,7 @@ def privileges_list(
password=None,
runas=None):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Return a list of privileges for the specified object.
@ -2637,7 +2637,7 @@ def has_privileges(name,
password=None,
runas=None):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Check if a role has the specified privileges on an object
@ -2759,7 +2759,7 @@ def privileges_grant(name,
password=None,
runas=None):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Grant privileges on a postgres object
@ -2885,7 +2885,7 @@ def privileges_revoke(name,
password=None,
runas=None):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Revoke privileges on a postgres object
@ -2991,7 +2991,7 @@ def datadir_init(name,
locale=None,
runas=None):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Initializes a postgres data directory
@ -3039,7 +3039,7 @@ def datadir_init(name,
def datadir_exists(name):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Checks if postgres data directory has been initialized

2
salt/modules/pushover_notify.py
View File

@ -2,7 +2,7 @@
'''
Module for sending messages to Pushover (https://www.pushover.net)
.. versionadded:: Boron
.. versionadded:: 2016.3.0
:configuration: This module can be used by either passing an api key and version
directly or by specifying both in a configuration profile in the salt

2
salt/modules/pw_user.py
View File

@ -432,7 +432,7 @@ def get_loginclass(name):
'''
Get the login class of the user
.. versionadded:: Boron
.. versionadded:: 2016.3.0
CLI Example:

2
salt/modules/rabbitmq.py
View File

@ -283,7 +283,7 @@ def clear_password(name, runas=None):
def check_password(name, password, runas=None):
'''
.. versionadded:: Boron
.. versionadded:: 2016.3.0
Checks if a user's password is valid.

4
salt/modules/redismod.py
View File

@ -509,7 +509,7 @@ def sentinel_get_master_ip(master, host=None, port=None, password=None):
'''
Get ip for sentinel master
.. versionadded: Boron
.. versionadded: 2016.3.0
CLI Example:
@ -526,7 +526,7 @@ def get_master_ip(host=None, port=None, password=None):
'''
Get host information about slave
.. versionadded: Boron
.. versionadded: 2016.3.0
CLI Example:

50
salt/modules/reg.py
View File

@ -4,7 +4,7 @@
Manage the Windows registry
===========================
The read_key and set_key functions will be updated in Boron to reflect proper
The read_key and set_key functions will be updated in Carbon to reflect proper
registry usage. The registry has three main components. Hives, Keys, and Values.
-----
@ -133,7 +133,7 @@ def read_key(hkey, path, key=None, use_32bit_registry=False):
'''
.. important::
The name of this function is misleading and will be changed to reflect
proper usage in the Boron release of Salt. The path option will be removed
proper usage in the Carbon release of Salt. The path option will be removed
and the key will be the actual key. See the following issue:
https://github.com/saltstack/salt/issues/25618
@ -143,7 +143,7 @@ def read_key(hkey, path, key=None, use_32bit_registry=False):
name. If key is not passed, this function will return the default value for
the key.
In the Boron release this function will be removed in favor of read_value.
In the Carbon release this function will be removed in favor of read_value.
Read registry key value
@ -163,10 +163,10 @@ def read_key(hkey, path, key=None, use_32bit_registry=False):
'vdata': None,
'success': True}
if key: # This if statement will be removed in Boron
salt.utils.warn_until('Boron', 'Use reg.read_value to read a registry '
if key: # This if statement will be removed in Carbon
salt.utils.warn_until('Carbon', 'Use reg.read_value to read a registry '
'value. This functionality will be '
'removed in Salt Boron')
'removed in Salt Carbon')
return read_value(hive=hkey,
key=path,
vname=key,
@ -260,7 +260,7 @@ def set_key(hkey,
'''
.. important ::
The name of this function is misleading and will be changed to reflect
proper usage in the Boron release of Salt. The path option will be removed
proper usage in the Carbon release of Salt. The path option will be removed
and the key will be the actual key. See the following issue:
https://github.com/saltstack/salt/issues/25618
@ -270,7 +270,7 @@ def set_key(hkey,
name. If key is not passed, this function will return the default value for
the key.
In the Boron release this function will be removed in favor of set_value.
In the Carbon release this function will be removed in favor of set_value.
Set a registry key
@ -283,10 +283,10 @@ def set_key(hkey,
salt '*' reg.set_key HKEY_CURRENT_USER 'SOFTWARE\\Salt' 'version' '0.97' REG_DWORD
'''
if key: # This if statement will be removed in Boron
salt.utils.warn_until('Boron', 'Use reg.set_value to set a registry '
if key: # This if statement will be removed in Carbon
salt.utils.warn_until('Carbon', 'Use reg.set_value to set a registry '
'value. This functionality will be '
'removed in Salt Boron')
'removed in Salt Carbon')
return set_value(hive=hkey,
key=path,
vname=key,
@ -339,7 +339,7 @@ def set_value(hive,
.. deprecated:: 2015.8.2
Use ``use_32bit_registry`` instead. The parameter seems to have no effect
since Windows 7 / Windows 2008R2 removed support for reflection. The
parameter will be removed in Boron.
parameter will be removed in Carbon.
:return: Returns True if successful, False if not
@ -379,7 +379,7 @@ def create_key(hkey,
'''
.. important ::
The name of this function is misleading and will be changed to reflect
proper usage in the Boron release of Salt. The path option will be removed
proper usage in the Carbon release of Salt. The path option will be removed
and the key will be the actual key. See the following issue:
https://github.com/saltstack/salt/issues/25618
@ -389,7 +389,7 @@ def create_key(hkey,
If key is not passed, this function will return the default value for the
key.
In the Boron release path will be removed and key will be the path. You will
In the Carbon release path will be removed and key will be the path. You will
not pass value.
Create a registry key
@ -400,10 +400,10 @@ def create_key(hkey,
salt '*' reg.create_key HKEY_CURRENT_USER 'SOFTWARE\\Salt' 'version' '0.97'
'''
if key: # This if statement will be removed in Boron
salt.utils.warn_until('Boron', 'Use reg.set_value to create a registry '
if key: # This if statement will be removed in Carbon
salt.utils.warn_until('Carbon', 'Use reg.set_value to create a registry '
'value. This functionality will be '
'removed in Salt Boron')
'removed in Salt Carbon')
return set_value(hive=hkey,
key=path,
vname=key,
@ -422,7 +422,7 @@ def delete_key(hkey,
'''
.. important::
The name of this function is misleading and will be changed to reflect
proper usage in the Boron release of Salt. The path option will be removed
proper usage in the Carbon release of Salt. The path option will be removed
and the key will be the actual key. See the following issue:
https://github.com/saltstack/salt/issues/25618
@ -432,7 +432,7 @@ def delete_key(hkey,
name. If key is not passed, this function will return the default value for
the key.
In the Boron release path will be removed and key will be the path.
In the Carbon release path will be removed and key will be the path.
reflection will also be removed.
Delete a registry key
@ -453,14 +453,14 @@ def delete_key(hkey,
:param str path: (will be changed to key) The key (looks like a path) to
remove.
:param str key: (used incorrectly) Will be removed in Boron
:param str key: (used incorrectly) Will be removed in Carbon
:param bool reflection: A boolean value indicating that the value should
also be removed from the Wow6432Node portion of the registry. Only applies
to 64 bit Windows. This setting is ignored for 32 bit Windows.
Only applies to delete value. If the key parameter is passed, this function
calls delete_value instead. Will be changed in Boron.
calls delete_value instead. Will be changed in Carbon.
:param bool force: A boolean value indicating that all subkeys should be
removed as well. If this is set to False (default) and there are subkeys,
@ -472,11 +472,11 @@ def delete_key(hkey,
:rtype: bool
'''
if key: # This if statement will be removed in Boron
salt.utils.warn_until('Boron',
if key: # This if statement will be removed in Carbon
salt.utils.warn_until('Carbon',
'Variable names will be changed to match Windows '
'Registry terminology. These changes will be '
'made in Boron')
'made in Carbon')
return delete_value(hive=hkey,
key=path,
vname=key,
@ -604,7 +604,7 @@ def delete_value(hive, key, vname=None, reflection=True, use_32bit_registry=Fals
.. deprecated:: 2015.8.2
Use ``use_32bit_registry`` instead. The parameter seems to have no effect
since Windows 7 / Windows 2008R2 removed support for reflection. This
parameter will be removed in Boron.
parameter will be removed in Carbon.
:return: Returns True if successful, False if not

6
salt/modules/rsync.py
View File

@ -52,7 +52,7 @@ def rsync(src,
exclude=None,
excludefrom=None):
'''
.. versionchanged:: Boron
.. versionchanged:: 2016.3.0
Return data now contains just the output of the rsync command, instead
of a dictionary as returned from :py:func:`cmd.run_all
<salt.modules.cmdmod.run_all>`.
@ -95,7 +95,7 @@ def rsync(src,
def version():
'''
.. versionchanged:: Boron
.. versionchanged:: 2016.3.0
Return data now contains just the version number as a string, instead
of a dictionary as returned from :py:func:`cmd.run_all
<salt.modules.cmdmod.run_all>`.
@ -122,7 +122,7 @@ def version():
def config(conf_path='/etc/rsyncd.conf'):
'''
.. versionchanged:: Boron
.. versionchanged:: 2016.3.0
Return data now contains just the contents of the rsyncd.conf as a
string, instead of a dictionary as returned from :py:func:`cmd.run_all
<salt.modules.cmdmod.run_all>`.

6
salt/modules/selinux.py
View File

@ -203,7 +203,7 @@ def getsemod(module):
salt '*' selinux.getsemod mysql
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
return list_semod().get(module, {})
@ -218,7 +218,7 @@ def setsemod(module, state):
salt '*' selinux.setsemod nagios Enabled
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
if state.lower() == 'enabled':
cmd = 'semodule -e {0}'.format(module)
@ -238,7 +238,7 @@ def list_semod():
salt '*' selinux.list_semod
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
mdata = __salt__['cmd.run']('semodule -l').splitlines()
ret = {}

6
salt/modules/smartos_virt.py
View File

@ -244,7 +244,7 @@ def get_macs(domain):
# Deprecated aliases
def create(domain):
'''
.. deprecated:: Boron
.. deprecated:: Nitrogen
Use :py:func:`~salt.modules.virt.start` instead.
Start a defined domain
@ -261,7 +261,7 @@ def create(domain):
def destroy(domain):
'''
.. deprecated:: Boron
.. deprecated:: Nitrogen
Use :py:func:`~salt.modules.virt.stop` instead.
Power off a defined domain
@ -278,7 +278,7 @@ def destroy(domain):
def list_vms():
'''
.. deprecated:: Boron
.. deprecated:: Nitrogen
Use :py:func:`~salt.modules.virt.list_domains` instead.
List all virtual machines.

2
salt/modules/solaris_fmadm.py
View File

@ -6,7 +6,7 @@ Module for running fmadm and fmdump on Solaris
:maturity: new
:platform: solaris,illumos
.. versionadded:: Boron
.. versionadded:: 2016.3.0
'''
from __future__ import absolute_import

Some files were not shown because too many files have changed in this diff Show More