mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Replace Nitrogen with 2017.7.0 in remain directories
This commit is contained in:
rallytime
parent
00ecda1002
commit
cc07664a9f
16 changed files with 31 additions and 31 deletions
|
|
@ -28,27 +28,27 @@
|
|||
# dictionary. Otherwise it is assumed that the module calls the grains
|
||||
# function in a custom way and returns the data elsewhere
|
||||
#
|
||||
# Default to False for 2016.3 and 2016.11. Switch to True for Nitrogen.
|
||||
# Default to False for 2016.3 and 2016.11. Switch to True for 2017.7.0.
|
||||
# proxy_merge_grains_in_module: True
|
||||
|
||||
# If a proxymodule has a function called 'alive' returning a boolean
|
||||
# flag reflecting the state of the connection with the remove device,
|
||||
# when this option is set as True, a scheduled job on the proxy will
|
||||
# try restarting the connection. The polling frequency depends on the
|
||||
# next option, 'proxy_keep_alive_interval'. Added in Nitrogen.
|
||||
# next option, 'proxy_keep_alive_interval'. Added in 2017.7.0.
|
||||
# proxy_keep_alive: True
|
||||
|
||||
# The polling interval (in minutes) to check if the underlying connection
|
||||
# with the remote device is still alive. This option requires
|
||||
# 'proxy_keep_alive' to be configured as True and the proxymodule to
|
||||
# implement the 'alive' function. Added in Nitrogen.
|
||||
# implement the 'alive' function. Added in 2017.7.0.
|
||||
# proxy_keep_alive_interval: 1
|
||||
|
||||
# By default, any proxy opens the connection with the remote device when
|
||||
# initialized. Some proxymodules allow through this option to open/close
|
||||
# the session per command. This requires the proxymodule to have this
|
||||
# capability. Please consult the documentation to see if the proxy type
|
||||
# used can be that flexible. Added in Nitrogen.
|
||||
# used can be that flexible. Added in 2017.7.0.
|
||||
# proxy_always_alive: True
|
||||
|
||||
# If multiple masters are specified in the 'master' setting, the default behavior
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Beacon to fire events at specific log messages.
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
'''
|
||||
|
||||
|
|
|
|||
2
salt/cache/redis_cache.py
vendored
2
salt/cache/redis_cache.py
vendored
|
|
@ -5,7 +5,7 @@ Redis
|
|||
|
||||
Redis plugin for the Salt caching subsystem.
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
As Redis provides a simple mechanism for very fast key-value store,
|
||||
in order to privde the necessary features for the Salt
|
||||
|
|
|
|||
|
|
@ -673,7 +673,7 @@ class LocalClient(object):
|
|||
* ``compound`` - Pass a compound match string
|
||||
* ``ipcidr`` - Match based on Subnet (CIDR notation) or IPv4 address.
|
||||
|
||||
.. versionchanged:: Nitrogen
|
||||
.. versionchanged:: 2017.7.0
|
||||
Renamed from ``expr_form`` to ``tgt_type``
|
||||
|
||||
:param ret: The returner to use. The value passed can be single
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ class SSHClient(object):
|
|||
>>> sshclient.cmd_subset('*', 'test.ping', sub=1)
|
||||
{'jerry': True}
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
'''
|
||||
if 'expr_form' in kwargs:
|
||||
salt.utils.warn_until(
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ def publish(tgt,
|
|||
- glob
|
||||
- pcre
|
||||
|
||||
.. versionchanged:: Nitrogen
|
||||
.. versionchanged:: 2017.7.0
|
||||
The ``expr_form`` argument has been renamed to ``tgt_type``, earlier
|
||||
releases must use ``expr_form``.
|
||||
|
||||
|
|
|
|||
|
|
@ -555,7 +555,7 @@ def __get_ssh_credentials(vm_):
|
|||
|
||||
def create_network(kwargs=None, call=None):
|
||||
'''
|
||||
... versionchanged:: Nitrogen
|
||||
... versionchanged:: 2017.7.0
|
||||
Create a GCE network. Must specify name and cidr.
|
||||
|
||||
CLI Example:
|
||||
|
|
@ -706,7 +706,7 @@ def show_network(kwargs=None, call=None):
|
|||
|
||||
def create_subnetwork(kwargs=None, call=None):
|
||||
'''
|
||||
... versionadded:: Nitrogen
|
||||
... versionadded:: 2017.7.0
|
||||
Create a GCE Subnetwork. Must specify name, cidr, network, and region.
|
||||
|
||||
CLI Example:
|
||||
|
|
@ -788,7 +788,7 @@ def create_subnetwork(kwargs=None, call=None):
|
|||
|
||||
def delete_subnetwork(kwargs=None, call=None):
|
||||
'''
|
||||
... versionadded:: Nitrogen
|
||||
... versionadded:: 2017.7.0
|
||||
Delete a GCE Subnetwork. Must specify name and region.
|
||||
|
||||
CLI Example:
|
||||
|
|
@ -856,7 +856,7 @@ def delete_subnetwork(kwargs=None, call=None):
|
|||
|
||||
def show_subnetwork(kwargs=None, call=None):
|
||||
'''
|
||||
... versionadded:: Nitrogen
|
||||
... versionadded:: 2017.7.0
|
||||
Show details of an existing GCE Subnetwork. Must specify name and region.
|
||||
|
||||
CLI Example:
|
||||
|
|
@ -2165,7 +2165,7 @@ def start(vm_name, call=None):
|
|||
'''
|
||||
Call GCE 'start on the instance.
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -2209,7 +2209,7 @@ def stop(vm_name, call=None):
|
|||
'''
|
||||
Call GCE 'stop' on the instance.
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -2385,7 +2385,7 @@ def create_attach_volumes(name, kwargs, call=None):
|
|||
Volumes are attached in the order in which they are given, thus on a new
|
||||
node the first volume will be /dev/sdb, the second /dev/sdc, and so on.
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
'''
|
||||
if call != 'action':
|
||||
raise SaltCloudSystemExit(
|
||||
|
|
@ -2418,7 +2418,7 @@ def request_instance(vm_):
|
|||
'''
|
||||
Request a single GCE instance from a data dict.
|
||||
|
||||
.. versionchanged: Nitrogen
|
||||
.. versionchanged: 2017.7.0
|
||||
'''
|
||||
if not GCE_VM_NAME_REGEX.match(vm_['name']):
|
||||
raise SaltCloudSystemExit(
|
||||
|
|
|
|||
|
|
@ -966,7 +966,7 @@ VALID_OPTS = {
|
|||
# dictionary. Otherwise it is assumed that the module calls the grains
|
||||
# function in a custom way and returns the data elsewhere
|
||||
#
|
||||
# Default to False for 2016.3 and 2016.11. Switch to True for Nitrogen
|
||||
# Default to False for 2016.3 and 2016.11. Switch to True for 2017.7.0
|
||||
'proxy_merge_grains_in_module': bool,
|
||||
|
||||
# Command to use to restart salt-minion
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ def start(token,
|
|||
api_url: ``https://api.hipchat.com``
|
||||
The URL to the HipChat API.
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
max_rooms: ``1000``
|
||||
Maximum number of rooms allowed to fetch. If set to 0,
|
||||
|
|
@ -237,13 +237,13 @@ def start(token,
|
|||
|
||||
This can be overriden when executing a command, using the ``--out-type`` argument.
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
outputter: ``nested``
|
||||
The format to display the data, using the outputters available on the CLI.
|
||||
This argument can also be overriden when executing a command, using the ``--out`` option.
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
HipChat Example:
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
IRC Bot engine
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
Example Configuration
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
Junos Syslog Engine
|
||||
==========================
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
|
||||
:depends: pyparsing, twisted
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
NAPALM syslog engine
|
||||
====================
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
An engine that takes syslog messages structured in
|
||||
OpenConfig_ or IETF format
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ prefaced with a ``!``.
|
|||
cmd: pillar.get salt:engines:slack:valid_commands target=saltmaster tgt_type=list
|
||||
|
||||
:configuration: Example configuration using groups
|
||||
.. versionadded: Nitrogen
|
||||
.. versionadded: 2017.7.0
|
||||
|
||||
engines:
|
||||
slack:
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ connected for a certain period of time.
|
|||
|
||||
Requires that the minion_data_cache option be enabled.
|
||||
|
||||
.. versionadded: Nitrogen
|
||||
.. versionadded: 2017.7.0
|
||||
|
||||
:configuration:
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
'''
|
||||
Grains from cloud metadata servers at 169.254.169.254
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
:depends: requests
|
||||
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ def username(proxy=None):
|
|||
'''
|
||||
Return the username.
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
CLI Example - select all devices using `foobar` as username for connection:
|
||||
|
||||
|
|
@ -331,7 +331,7 @@ def host(proxy=None):
|
|||
while ``hostname`` provides the hostname as configured on the device.
|
||||
They are not necessarily the same.
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -374,7 +374,7 @@ def host_dns(proxy=None):
|
|||
|
||||
napalm_host_dns_grain: true
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -430,7 +430,7 @@ def optional_args(proxy=None):
|
|||
|
||||
Sensible data will not be returned.
|
||||
|
||||
.. versionadded:: Nitrogen
|
||||
.. versionadded:: 2017.7.0
|
||||
|
||||
CLI Example - select all devices connecting via port 1234:
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue