mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
Started changing Beryllium references to 2015.8.0
This commit is contained in:
parent
6fe7ebd583
commit
abfae94e1d
51 changed files with 112 additions and 141 deletions
|
@ -16,7 +16,7 @@ normally requires.
|
|||
directory: 3456789012
|
||||
# But not both
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
'''
|
||||
|
||||
from __future__ import absolute_import
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Connection module for Amazon EC2
|
||||
|
||||
.. versionadded:: TBD
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
:configuration: This module accepts explicit EC2 credentials but can also
|
||||
utilize IAM roles assigned to the instance trough Instance Profiles.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Connection module for Amazon KMS
|
||||
|
||||
.. versionadded:: beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
:configuration: This module accepts explicit kms credentials but can also utilize
|
||||
IAM roles assigned to the instance trough Instance Profiles. Dynamic
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
Manage and query Cabal packages
|
||||
===============================
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
'''
|
||||
from __future__ import absolute_import
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Support for IFTTT
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
Requires an ``api_key`` in ``/etc/salt/minion``:
|
||||
|
||||
|
@ -40,9 +40,7 @@ def _query(event=None,
|
|||
header_dict=None,
|
||||
data=None):
|
||||
'''
|
||||
Make a web call to IFTTT
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
Make a web call to IFTTT.
|
||||
'''
|
||||
secret_key = __salt__['config.get']('ifttt.secret_key') or \
|
||||
__salt__['config.get']('ifttt:secret_key')
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
'''
|
||||
Apache Traffic Server execution module
|
||||
Apache Traffic Server execution module.
|
||||
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
``traffic_line`` is used to execute individual Traffic Server commands and to
|
||||
script multiple commands in a shell.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Support for VictorOps
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
Requires an ``api_key`` in ``/etc/salt/minion``:
|
||||
|
||||
|
@ -47,8 +47,6 @@ def _query(action=None,
|
|||
data=None):
|
||||
'''
|
||||
Make a web call to VictorOps
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
'''
|
||||
api_key = __salt__['config.get']('victorops.api_key') or \
|
||||
__salt__['config.get']('victorops:api_key')
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
This module allows you to control the power settings of a windows minion via
|
||||
powercfg.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Manage X509 certificates
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
'''
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
'''
|
||||
Use remote Mercurial repository as a Pillar source.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
The module depends on the ``hglib`` python module being available.
|
||||
This is the same requirement as for hgfs_ so should not pose any extra
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Return data to an influxdb server.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
To enable this returner the minion will need the python client for influxdb
|
||||
installed and the following values configured in the minion or master
|
||||
|
|
|
@ -103,7 +103,7 @@ def lookup_jid(jid,
|
|||
When set to `True`, adds the minions that did return from the command.
|
||||
Default: `True`.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
missing
|
||||
When set to `True`, adds the minions that did NOT return from the command.
|
||||
|
@ -365,7 +365,7 @@ def last_run(ext_source=None,
|
|||
'''
|
||||
List all detectable jobs and associated functions
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ def _do(name, fun, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
'''
|
||||
host = find_guest(name, quiet=True, path=path)
|
||||
if not host:
|
||||
|
@ -67,7 +67,7 @@ def _do_names(names, fun, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
'''
|
||||
ret = {}
|
||||
hosts = find_guests(names, path=path)
|
||||
|
@ -100,7 +100,7 @@ def find_guest(name, quiet=False, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
|
||||
.. code-block:: bash
|
||||
|
@ -131,7 +131,7 @@ def find_guests(names, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
'''
|
||||
ret = {}
|
||||
|
@ -175,7 +175,7 @@ def init(names, host=None, saltcloud_mode=False, quiet=False, **kwargs):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
saltcloud_mode
|
||||
init the container with the saltcloud opts format instead
|
||||
|
@ -416,7 +416,7 @@ def cloud_init(names, host=None, quiet=False, **kwargs):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
saltcloud_mode
|
||||
init the container with the saltcloud opts format instead
|
||||
|
@ -435,7 +435,7 @@ def _list_iter(host=None, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
'''
|
||||
tgt = host or '*'
|
||||
client = salt.client.get_local_client(__opts__['conf_file'])
|
||||
|
@ -469,7 +469,7 @@ def list_(host=None, quiet=False, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
|
@ -494,7 +494,7 @@ def purge(name, delete_key=True, quiet=False, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
|
@ -525,7 +525,7 @@ def start(name, quiet=False, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
|
@ -546,7 +546,7 @@ def stop(name, quiet=False, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
|
@ -567,7 +567,7 @@ def freeze(name, quiet=False, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
|
@ -588,7 +588,7 @@ def unfreeze(name, quiet=False, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
|
@ -609,7 +609,7 @@ def info(name, quiet=False, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
|
|
|
@ -157,7 +157,7 @@ def list_state(subset=None, show_ipv4=False, state=None):
|
|||
Show minions being in specific state that is one of 'available', 'joined',
|
||||
'allowed', 'alived' or 'reaped'.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
@ -203,7 +203,7 @@ def list_not_state(subset=None, show_ipv4=False, state=None):
|
|||
Show minions being in specific state that is one of 'available', 'joined',
|
||||
'allowed', 'alived' or 'reaped'.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
@ -236,7 +236,7 @@ def present(subset=None, show_ipv4=False):
|
|||
Print a list of all minions that are up according to Salt's presence
|
||||
detection (no commands will be sent to minions)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
subset : None
|
||||
Pass in a CIDR range to filter minions by IP address.
|
||||
|
@ -244,7 +244,7 @@ def present(subset=None, show_ipv4=False):
|
|||
show_ipv4 : False
|
||||
Also show the IP address each minion is connecting from.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
@ -266,7 +266,7 @@ def not_present(subset=None, show_ipv4=False):
|
|||
show_ipv4 : False
|
||||
Also show the IP address each minion is connecting from.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
@ -288,7 +288,7 @@ def joined(subset=None, show_ipv4=False):
|
|||
show_ipv4 : False
|
||||
Also show the IP address each minion is connecting from.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
@ -310,7 +310,7 @@ def not_joined(subset=None, show_ipv4=False):
|
|||
show_ipv4 : False
|
||||
Also show the IP address each minion is connecting from.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
@ -332,7 +332,7 @@ def allowed(subset=None, show_ipv4=False):
|
|||
show_ipv4 : False
|
||||
Also show the IP address each minion is connecting from.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
@ -354,7 +354,7 @@ def not_allowed(subset=None, show_ipv4=False):
|
|||
show_ipv4 : False
|
||||
Also show the IP address each minion is connecting from.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
@ -376,7 +376,7 @@ def alived(subset=None, show_ipv4=False):
|
|||
show_ipv4 : False
|
||||
Also show the IP address each minion is connecting from.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
@ -398,7 +398,7 @@ def not_alived(subset=None, show_ipv4=False):
|
|||
show_ipv4 : False
|
||||
Also show the IP address each minion is connecting from.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
@ -420,7 +420,7 @@ def reaped(subset=None, show_ipv4=False):
|
|||
show_ipv4 : False
|
||||
Also show the IP address each minion is connecting from.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
@ -442,7 +442,7 @@ def not_reaped(subset=None, show_ipv4=False):
|
|||
show_ipv4 : False
|
||||
Also show the IP address each minion is connecting from.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Package helper functions using ``salt.modules.pkg``
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
'''
|
||||
|
||||
# Import python libs
|
||||
|
|
|
@ -361,7 +361,7 @@ def salt_spm():
|
|||
'''
|
||||
The main function for spm, the Salt Package Manager
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
'''
|
||||
import salt.cli.spm
|
||||
spm = salt.cli.spm.SPM() # pylint: disable=E1120
|
||||
|
|
|
@ -6,7 +6,7 @@ Generic REST API SDB Module
|
|||
:maturity: New
|
||||
:platform: all
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
This module allows access to a REST interface using an ``sdb://`` URI.
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
'''
|
||||
Management of the Salt beacons
|
||||
==============================================
|
||||
==============================
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Connection module for Amazon Cloud Formation
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
:configuration: This module accepts explicit AWS credentials but can also utilize
|
||||
IAM roles assigned to the instance trough Instance Profiles. Dynamic
|
||||
|
@ -61,8 +61,6 @@ def present(name, template_body=None, template_url=None, parameters=None, notifi
|
|||
'''
|
||||
Ensure cloud formation stack is present.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
|
||||
name (string) - Name of the stack.
|
||||
|
||||
template_body (string) – Structure containing the template body. Can also be loaded from a file by using salt://.
|
||||
|
@ -184,8 +182,6 @@ def absent(name, region=None, key=None, keyid=None, profile=None):
|
|||
'''
|
||||
Ensure cloud formation stack is absent.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
|
||||
name (string) – The name of the stack to delete.
|
||||
|
||||
region (string) - Region to connect to.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Manage EC2
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
This module provides an interface to the Elastic Compute Cloud (EC2) service
|
||||
from AWS.
|
||||
|
|
|
@ -253,7 +253,7 @@ def subnet_group_present(name, subnet_ids, description, tags=None, region=None,
|
|||
'''
|
||||
Ensure ElastiCache subnet group exists.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
name
|
||||
The name for the ElastiCache subnet group. This value is stored as a lowercase string.
|
||||
|
|
|
@ -362,7 +362,7 @@ def register_instances(name, instances, region=None, key=None, keyid=None,
|
|||
'''
|
||||
Add instance/s to load balancer
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
Manage IAM roles.
|
||||
=================
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
This module uses ``boto``, which can be installed via package, or pip.
|
||||
|
||||
|
@ -138,9 +138,6 @@ def __virtual__():
|
|||
|
||||
def user_absent(name, delete_keys=None, region=None, key=None, keyid=None, profile=None):
|
||||
'''
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
|
||||
Ensure the IAM user is absent. User cannot be deleted if it has keys.
|
||||
|
||||
name (string)
|
||||
|
@ -198,9 +195,6 @@ def user_absent(name, delete_keys=None, region=None, key=None, keyid=None, profi
|
|||
|
||||
def keys_present(name, number, save_dir, region=None, key=None, keyid=None, profile=None):
|
||||
'''
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
|
||||
Ensure the IAM access keys are present.
|
||||
|
||||
name (string)
|
||||
|
@ -286,9 +280,6 @@ def keys_present(name, number, save_dir, region=None, key=None, keyid=None, prof
|
|||
|
||||
def keys_absent(access_keys, user_name, region=None, key=None, keyid=None, profile=None):
|
||||
'''
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
|
||||
Ensure the IAM user access_key_id is absent.
|
||||
|
||||
access_key_id (list)
|
||||
|
@ -351,9 +342,6 @@ def _delete_key(ret, access_key_id, user_name, region=None, key=None, keyid=None
|
|||
def user_present(name, policies=None, policies_from_pillars=None, password=None, path=None, region=None, key=None,
|
||||
keyid=None, profile=None):
|
||||
'''
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
|
||||
Ensure the IAM user is present
|
||||
|
||||
name (string)
|
||||
|
@ -512,9 +500,6 @@ def _case_password(ret, name, password, region=None, key=None, keyid=None, profi
|
|||
|
||||
def group_present(name, policies=None, policies_from_pillars=None, users=None, region=None, key=None, keyid=None, profile=None):
|
||||
'''
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
|
||||
Ensure the IAM group is present
|
||||
|
||||
name (string)
|
||||
|
@ -703,9 +688,7 @@ def account_policy(allow_users_to_change_password=None, hard_expiry=None, max_pa
|
|||
region=None, key=None, keyid=None,
|
||||
profile=None):
|
||||
'''
|
||||
Change account policy
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
Change account policy.
|
||||
|
||||
allow_users_to_change_password (bool)
|
||||
Allows all IAM users in your account to
|
||||
|
@ -792,9 +775,7 @@ def account_policy(allow_users_to_change_password=None, hard_expiry=None, max_pa
|
|||
|
||||
def server_cert_absent(name, region=None, key=None, keyid=None, profile=None):
|
||||
'''
|
||||
Deletes a server certificate
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
Deletes a server certificate.
|
||||
|
||||
name (string)
|
||||
The name for the server certificate. Do not include the path in this value.
|
||||
|
@ -835,8 +816,6 @@ def server_cert_present(name, public_key, private_key, cert_chain=None, path=Non
|
|||
'''
|
||||
Crete server certificate.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
|
||||
name (string)
|
||||
The name for the server certificate. Do not include the path in this value.
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@ with the role. This is the default behavior of the AWS console.
|
|||
|
||||
If ``delete_policies: False`` is specified, existing policies that are not in
|
||||
the given list of policies will not be deleted. This allows manual modifications
|
||||
on the IAM role to be persistent. This functionality was added in Beryllium.
|
||||
on the IAM role to be persistent. This functionality was added in 2015.8.0.
|
||||
'''
|
||||
from __future__ import absolute_import
|
||||
import salt.utils.dictupdate as dictupdate
|
||||
|
@ -147,7 +147,7 @@ def present(
|
|||
value is ``True``. If ``False`` is specified, existing policies will not be deleted
|
||||
allowing manual modifications on the IAM role to be persistent.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
'''
|
||||
ret = {'name': name, 'result': True, 'comment': '', 'changes': {}}
|
||||
_ret = _role_present(name, policy_document, path, region, key, keyid,
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Manage KMS keys, key policies and grants.
|
||||
|
||||
.. versionadded:: beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
Be aware that this interacts with Amazon's services, and so may incur charges.
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
'''
|
||||
Manage RDSs
|
||||
=================
|
||||
===========
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
Create and destroy RDS instances. Be aware that this interacts with Amazon's
|
||||
services, and so may incur charges.
|
||||
|
@ -316,8 +316,6 @@ def subnet_group_present(name, subnet_ids, description, tags=None, region=None,
|
|||
'''
|
||||
Ensure DB subnet group exists.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
|
||||
name
|
||||
The name for the DB subnet group. This value is stored as a lowercase string.
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
Manage VPCs
|
||||
=================
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
Create and destroy VPCs. Be aware that this interacts with Amazon's services,
|
||||
and so may incur charges.
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
Installation of Cabal Packages
|
||||
==============================
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
These states manage the installed packages for Haskell using
|
||||
cabal. Note that cabal-install must be installed for these states to
|
||||
|
|
|
@ -731,7 +731,7 @@ def run(name,
|
|||
Ignore the timeout of commands, which is useful for running nohup
|
||||
processes.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
creates
|
||||
Only run if the file specified by ``creates`` does not exist.
|
||||
|
|
|
@ -1095,7 +1095,7 @@ def running(name,
|
|||
This state will ask nginx to reload (instead of restart)
|
||||
each time the /etc/nginx/nginx.conf is modified.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
|
||||
For other parameters, see salt.modules.dockerio execution module
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Management of Docker containers
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
|
||||
This is the state module to accompany the :mod:`dockerng
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
Manage etcd Keys
|
||||
================
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
:depends: - python-etcd
|
||||
|
||||
|
|
|
@ -2343,7 +2343,7 @@ def line(name, content, match=None, mode=None, location=None,
|
|||
'''
|
||||
Line-based editing of a file.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
Params are identical to the remote execution function
|
||||
:mod:`file.line <salt.modules.file.line>`.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Management of firewalld
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
The following example applies changes to the public zone, blocks echo-reply
|
||||
and echo-request packets, does not set the zone to be the default, enables
|
||||
|
|
|
@ -5,7 +5,7 @@ Trigger an event in IFTTT
|
|||
|
||||
This state is useful for trigging events in IFTTT.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ def present(name,
|
|||
lvname=None,
|
||||
path=None):
|
||||
'''
|
||||
.. versionchanged:: Beryllium
|
||||
.. versionchanged:: 2015.8.0
|
||||
|
||||
The :mod:`lxc.created <salt.states.lxc.created>` state has been renamed
|
||||
to ``lxc.present``, and the :mod:`lxc.cloned <salt.states.lxc.cloned>`
|
||||
|
@ -45,7 +45,7 @@ def present(name,
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
|
||||
running : False
|
||||
|
@ -54,7 +54,7 @@ def present(name,
|
|||
* If ``None``, do nothing with regards to the running state of the
|
||||
container
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
clone_from
|
||||
Create named container as a clone of the specified container
|
||||
|
@ -335,7 +335,7 @@ def absent(name, stop=False, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
|
||||
.. code-block:: yaml
|
||||
|
@ -390,7 +390,7 @@ def running(name, restart=False, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
restart : False
|
||||
Restart container if it is already running
|
||||
|
@ -487,7 +487,7 @@ def frozen(name, start=True, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
|
||||
start : True
|
||||
|
@ -575,7 +575,7 @@ def stopped(name, kill=False, path=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
kill : False
|
||||
Do not wait for the container to stop, kill all tasks in the container.
|
||||
|
@ -730,7 +730,7 @@ def edited_conf(name, lxc_conf=None, lxc_conf_unset=None):
|
|||
path to the container parent
|
||||
default: /var/lib/lxc (system default)
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
|
||||
.. code-block:: bash
|
||||
|
|
|
@ -1647,7 +1647,7 @@ def removed(name, version=None, pkgs=None, normalize=True, **kwargs):
|
|||
part of the name, such as kernel modules which match a specific kernel
|
||||
version.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
Multiple Package Options:
|
||||
|
||||
|
@ -1688,7 +1688,7 @@ def purged(name, version=None, pkgs=None, normalize=True, **kwargs):
|
|||
part of the name, such as kernel modules which match a specific kernel
|
||||
version.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
Multiple Package Options:
|
||||
|
||||
|
@ -1771,7 +1771,7 @@ def uptodate(name, refresh=False, **kwargs):
|
|||
|
||||
def group_installed(name, skip=None, include=None, **kwargs):
|
||||
'''
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
Ensure that an entire package group is installed. This state is only
|
||||
supported for the :mod:`yum <salt.modules.yumpkg>` package manager.
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
The pkgbuild state is the front of Salt package building backend. It
|
||||
automatically
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
|
|
|
@ -1,16 +1,20 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
'''
|
||||
Management of PostgreSQL tablespace
|
||||
==================================
|
||||
===================================
|
||||
The postgres_tablespace module is used to create and manage Postgres
|
||||
tablespaces.
|
||||
|
||||
Tablespaces can be set as either absent or present.
|
||||
|
||||
.. code-block:: yaml
|
||||
ssd-tablespace:
|
||||
postgres_tablespace.present:
|
||||
- name: indexes
|
||||
- directory: /mnt/ssd-data
|
||||
.. versionadded:: Beryllium
|
||||
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
'''
|
||||
from __future__ import absolute_import
|
||||
|
||||
|
@ -34,7 +38,8 @@ def present(name,
|
|||
db_user=None):
|
||||
'''
|
||||
Ensure that the named tablespace is present with the specified properties.
|
||||
For more information about all of these options see man create_tablespace(1)
|
||||
For more information about all of these options see man create_tablespace(1).
|
||||
|
||||
name
|
||||
The name of the tablespace to create/manage.
|
||||
directory
|
||||
|
@ -58,7 +63,6 @@ def present(name,
|
|||
user
|
||||
System user all operations should be performed on behalf of
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
'''
|
||||
ret = {'name': name,
|
||||
'changes': {},
|
||||
|
@ -132,7 +136,8 @@ def absent(name,
|
|||
db_port=None,
|
||||
db_user=None):
|
||||
'''
|
||||
Ensure that the named database is absent
|
||||
Ensure that the named database is absent.
|
||||
|
||||
name
|
||||
The name of the database to remove
|
||||
db_user
|
||||
|
@ -145,7 +150,6 @@ def absent(name,
|
|||
Database port if different from config or default
|
||||
user
|
||||
System user all operations should be performed on behalf of
|
||||
.. versionadded:: Beryllium
|
||||
'''
|
||||
ret = {'name': name,
|
||||
'changes': {},
|
||||
|
|
|
@ -381,7 +381,7 @@ def absent(name,
|
|||
in standard "authorized_keys" format. If this is set, comment, enc and
|
||||
options will be ignored.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
config
|
||||
The location of the authorized keys file relative to the user's home
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
'''
|
||||
Support for Stormpath
|
||||
Support for Stormpath.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
'''
|
||||
|
||||
# Import python libs
|
||||
|
@ -52,8 +52,6 @@ def present(name, **kwargs):
|
|||
|
||||
customData.
|
||||
Optional. Must be specified as a dict.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
'''
|
||||
# Because __opts__ is not available outside of functions
|
||||
if __opts__.get('requests_lib', False):
|
||||
|
@ -136,8 +134,6 @@ def absent(name, directory_id=None):
|
|||
each will be scanned for the account. Specifying a directory_id will
|
||||
therefore cut down on the number of requests to Stormpath, and increase
|
||||
performance of this state.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
'''
|
||||
# Because __opts__ is not available outside of functions
|
||||
if __opts__.get('requests_lib', False):
|
||||
|
|
|
@ -238,7 +238,7 @@ def show_notification(name, text=None, **kwargs):
|
|||
'''
|
||||
Simple notification using text argument.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
name
|
||||
A unique string.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Control Apache Traffic Server
|
||||
=============================
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
'''
|
||||
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
Create an Event in VictorOps
|
||||
============================
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
This state is useful for creating events on the
|
||||
VictorOps service during state runs.
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
This module allows you to control the power settings of a windows minion via
|
||||
powercfg.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Manage X509 Certificates
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
This module can enable managing a complete PKI infrastructure including creating private keys, CA's,
|
||||
certificates and CRLs. It includes the ability to generate a private key on a server, and have the
|
||||
|
|
|
@ -7,7 +7,7 @@ Note: This module depends on the dicts packed by the loader and,
|
|||
therefore, must be accessed via the loader or from the __utils__ dict.
|
||||
|
||||
The __utils__ dict will not be automatically available to execution modules
|
||||
until Beryllium. The `salt.utils.compat.pack_dunder` helper function
|
||||
until 2015.8.0. The `salt.utils.compat.pack_dunder` helper function
|
||||
provides backwards compatibility.
|
||||
|
||||
This module provides common functionality for the boto execution modules.
|
||||
|
@ -31,7 +31,7 @@ Example Usage:
|
|||
conn = _get_conn()
|
||||
vpc_id = _cache_id('test-vpc')
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
'''
|
||||
|
||||
# Import Python libs
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
'''
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
Utilities for accessing storage container blogs on Azure
|
||||
'''
|
||||
|
@ -26,7 +26,7 @@ log = logging.getLogger(__name__)
|
|||
|
||||
def get_storage_conn(storage_account=None, storage_key=None, opts=None):
|
||||
'''
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
Return a storage_conn object for the storage account
|
||||
'''
|
||||
|
@ -43,7 +43,7 @@ def get_storage_conn(storage_account=None, storage_key=None, opts=None):
|
|||
|
||||
def list_blobs(storage_conn=None, **kwargs):
|
||||
'''
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
List blobs associated with the container
|
||||
'''
|
||||
|
@ -73,7 +73,7 @@ def list_blobs(storage_conn=None, **kwargs):
|
|||
|
||||
def put_blob(storage_conn=None, **kwargs):
|
||||
'''
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
Upload a blob
|
||||
'''
|
||||
|
@ -123,7 +123,7 @@ def put_blob(storage_conn=None, **kwargs):
|
|||
|
||||
def get_blob(storage_conn=None, **kwargs):
|
||||
'''
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
Download a blob
|
||||
'''
|
||||
|
@ -170,7 +170,7 @@ def get_blob(storage_conn=None, **kwargs):
|
|||
|
||||
def object_to_dict(obj):
|
||||
'''
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
|
||||
Convert an object to a dictionary
|
||||
'''
|
||||
|
|
|
@ -175,7 +175,7 @@ scheduler to skip this first run and wait until the next scheduled run.
|
|||
The scheduler also supports scheduling jobs using a cron like format.
|
||||
This requires the python-croniter library.
|
||||
|
||||
... versionadded:: Beryllium
|
||||
... versionadded:: 2015.8.0
|
||||
|
||||
schedule:
|
||||
job1:
|
||||
|
@ -193,7 +193,7 @@ will not run once the specified time has passed. Time should be specified
|
|||
in a format support by the dateutil library.
|
||||
This requires the python-dateutil library.
|
||||
|
||||
... versionadded:: Beryllium
|
||||
... versionadded:: 2015.8.0
|
||||
|
||||
schedule:
|
||||
job1:
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Support for Stormpath
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
'''
|
||||
|
||||
# Import python libs
|
||||
|
@ -25,7 +25,7 @@ def query(action=None,
|
|||
'''
|
||||
Make a web call to Stormpath
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
'''
|
||||
if opts is None:
|
||||
opts = {}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Publish commands to the salt system from the command line on the master.
|
||||
|
||||
.. versionadded:: Beryllium
|
||||
.. versionadded:: 2015.8.0
|
||||
'''
|
||||
|
||||
from salt.scripts import salt_spm
|
||||
|
|
Loading…
Add table
Reference in a new issue