saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into mondodb_updates_unit_tests

Browse source
This commit is contained in:
Gareth J. Greenaway 2022-10-14 12:09:17 -07:00 • committed by GitHub
commit 18327eb219
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
260 changed files with 7457 additions and 4980 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/pr-checks.yml vendored
View file

@ -1,7 +1,7 @@
name: PR Checks
on:
pull_request_target:
pull_request:
types: [opened, synchronize]
permissions:

10
.github/workflows/release.yml vendored
View file

@ -10,6 +10,10 @@ on:
description: "Build Man Pages"
default: true
required: false
branch:
description: "Branch to build/push PR"
default: "master"
required: false
permissions:
contents: read
@ -36,6 +40,7 @@ jobs:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.inputs.branch }}
fetch-depth: 0
- name: Install Nox
@ -101,6 +106,9 @@ jobs:
apt-get install -y git/buster-backports
- uses: actions/checkout@v2
with:
ref: ${{ github.event.inputs.branch }}
- id: changed-files
if: github.event.inputs.manPages == 'true'
@ -163,6 +171,7 @@ jobs:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.inputs.branch }}
fetch-depth: 0
- name: Download salt-man-pages
@ -196,3 +205,4 @@ jobs:
This PR is auto-generated by
[create-pull-request](https://github.com/peter-evans/create-pull-request).
branch: docs_${{ github.event.inputs.saltVersion }}
base: ${{ github.event.inputs.branch }}

44
.pre-commit-config.yaml
View file

@ -8,20 +8,6 @@ repos:
hooks:
# ----- Packaging Requirements ------------------------------------------------------------------------------------>
- id: pip-tools-compile
alias: compile-pkg-linux-3.5-zmq-requirements
name: Linux Packaging Py3.5 ZeroMQ Requirements
files: ^requirements/((base|zeromq|crypto)\.txt|static/pkg/(linux\.in|py3\.5/linux\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.5
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/zeromq.txt
- requirements/static/pkg/linux.in
- id: pip-tools-compile
alias: compile-pkg-linux-3.6-zmq-requirements
name: Linux Packaging Py3.6 ZeroMQ Requirements
@ -215,23 +201,6 @@ repos:
# <---- Packaging Requirements -------------------------------------------------------------------------------------
# ----- CI Requirements ------------------------------------------------------------------------------------------->
- id: pip-tools-compile
alias: compile-ci-linux-py3.5-zmq-requirements
name: Linux CI Py3.5 ZeroMQ Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|pkg/py3\.5/linux\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.5
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --include=requirements/static/pkg/linux.in
- --include=requirements/static/ci/common.in
- --pip-args=--constraint=requirements/static/pkg/py{py_version}/linux.txt
- requirements/static/ci/linux.in
- id: pip-tools-compile
alias: compile-ci-linux-py3.6-zmq-requirements
name: Linux CI Py3.6 ZeroMQ Requirements
@ -317,19 +286,6 @@ repos:
- --pip-args=--constraint=requirements/static/pkg/py{py_version}/linux.txt
- requirements/static/ci/linux.in
- id: pip-tools-compile
alias: compile-ci-linux-crypto-py3.5-requirements
name: Linux CI Py3.5 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.5/linux-crypto\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.5
- --platform=linux
- --out-prefix=linux
- --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
- requirements/static/ci/crypto.in
- id: pip-tools-compile
alias: compile-ci-linux-crypto-py3.6-requirements
name: Linux CI Py3.6 Crypto Requirements

25
CHANGELOG.md
View file

@ -7,6 +7,31 @@ Versions are `MAJOR.PATCH`.
# Changelog
Salt 3005.1 (2022-09-26)
========================
Fixed
-----
- Fix arch parsing issue in apt source files (#62247)
- Fixed parsing CDROM apt sources (#62474)
- Use str() method instead of repo_line for when python3-apt is installed or not in aptpkg.py. (#62546)
- Remove the connection_timeout from netmiko_connection_args before netmiko_connection_args is added to __context__["netmiko_device"]["args"] which is passed along to the Netmiko library. (#62547)
- fixes #62553 by checking for disabled master_type before starting master connection and skipping it if set. (#62553)
- Fix runas with cmd module when using the onedir bundled packages (#62565)
- Fix the Pyinstaller hooks to preserve the environment if None is passed. (#62567, #62628)
- pkgrepo.managed sets wrong permissions on keys installed to /etc/apt/keyring (#62569)
- pkgrepo.managed creates zero byte gpg files when dearmoring contents to the same filename (#62570)
- Ensure default values for IPC Buffers are correct type (#62591)
- Fix a hang on salt-ssh when using sudo. (#62603)
- Renderers now have access to the correct set of salt functions. (#62610, #62620)
- Fix including Jinja template from absolute path (#62611)
- include jmespath in package requirements (#62613)
- Fix pkgrepo.managed signed-by in test=true mode (#62662)
- Ensure the status of the service is captured when the beacon function is called, even when the event is not being emitted. (#62675)
- The sub proxies controlled by Deltaproxy need to have their own req_channel otherwise there are timeout exceptions when the __master_req_channel_payload is fired and reacted on. (#62708)
Salt 3005 (2022-08-22)
======================

1
changelog/36138.fixed Normal file
View file

@ -0,0 +1 @@
Add kwargs to handle extra parameters for http.query

1
changelog/48609.changed Normal file
View file

@ -0,0 +1 @@
More intelligent diffing in changes of file.serialize state.

1
changelog/51620.fixed Normal file
View file

@ -0,0 +1 @@
Do not raise an exception in pkg.info_installed on nonzero return code

1
changelog/52354.fixed Normal file
View file

@ -0,0 +1 @@
Don't check for cached pillar errors on state.apply

1
changelog/57180.fixed Normal file
View file

@ -0,0 +1 @@
Don't check for cached pillar errors on state.apply

1
changelog/59339.fixed Normal file
View file

@ -0,0 +1 @@
Don't check for cached pillar errors on state.apply

1
changelog/59909.fixed Normal file
View file

@ -0,0 +1 @@
add load balancing policy default option and ensure the module can be executed with arguments from CLI

1
changelog/60170.fixed Normal file
View file

@ -0,0 +1 @@
Fixed cache directory corruption startup error

1
changelog/60700.added Normal file
View file

@ -0,0 +1 @@
Added autostart option to virt.defined and virt.running states, along with virt.update execution modules.

1
changelog/60915.fixed Normal file
View file

@ -0,0 +1 @@
Fixed parsing new format of terraform states in roster.terraform

3
changelog/61092.fixed Normal file
View file

@ -0,0 +1,3 @@
state.orchestrate_single only passes a pillar if it is set to the state
function. This allows it to be used with state functions that don't accept a
pillar keyword argument.

1
changelog/61650.fixed Normal file
View file

@ -0,0 +1 @@
Fix ssh config roster to correctly parse the ssh config files that contain spaces.

1
changelog/61931.added Normal file
View file

@ -0,0 +1 @@
Add ipwrap() jinja filter to wrap IPv6 addresses with brackets.

1
changelog/62030.fixed Normal file
View file

@ -0,0 +1 @@
Fix inconsitency regarding name and pkgs parameters between zypperpkg.upgrade() and yumpkg.upgrade()

1
changelog/62031.added Normal file
View file

@ -0,0 +1 @@
Add `diff_attr` parameter to pkg.upgrade() (zypper/yum).

1
changelog/62032.fixed Normal file
View file

@ -0,0 +1 @@
Fix attr=all handling in pkg.list_pkgs() (yum/zypper).

1
changelog/62074.fixed Normal file
View file

@ -0,0 +1 @@
Fix ordering of args to libcloud_storage.download_object module

1
changelog/62101.fixed Normal file
View file

@ -0,0 +1 @@
Remove leftover usage of impacket

1
changelog/62235.fixed Normal file
View file

@ -0,0 +1 @@
Fix salt-ssh not detecting `platform-python` as a valid interpreter on EL8

1
changelog/62390.fixed Normal file
View file

@ -0,0 +1 @@
Fix the "zpool.present" state when enabling zpool features that are already active.

1
changelog/62435.fixed Normal file
View file

@ -0,0 +1 @@
Provide better error handling in the various napalm proxy minion functions when the device is not accessible.

1
changelog/62474.fixed Normal file
View file

@ -0,0 +1 @@
Fixed parsing CDROM apt sources

1
changelog/62485.deprecated Normal file
View file

@ -0,0 +1 @@
The `expand_repo_def` function in `salt.modules.aptpkg` is now deprecated. It's only used in `salt.states.pkgrepo` and it has no use of being exposed to the CLI.

1
changelog/62676.fixed Normal file
View file

@ -0,0 +1 @@
Modified "_get_flags" function so that it returns regex flags instead of integers

1
changelog/62795.fixed Normal file
View file

@ -0,0 +1 @@
Fixing a bug when listing the running schedule if "schedule.enable" and/or "schedule.disable" has been run, where the "enabled" items is being treated as a schedule item.

1
changelog/62817.fixed Normal file
View file

@ -0,0 +1 @@
Prevent annoying RuntimeWarning message about line buffering (buffering=1) not being supported in binary mode

2
changelog/62818.fixed Normal file
View file

@ -0,0 +1,2 @@
Include UID and GID checks in modules.file.check_perms as well as comparing
ownership by username and group name.

1
changelog/62854.fixed Normal file
View file

@ -0,0 +1 @@
Use select instead of iterating over entrypoints as a dictionary for importlib_metadata>=5.0.0

1
changelog/62856.added Normal file
View file

@ -0,0 +1 @@
Add password/account locking/unlocking in user.present state on supported operating systems

1
changelog/62858.fixed Normal file
View file

@ -0,0 +1 @@
Fixed master job scheduler using when

1
changelog/62882.fixed Normal file
View file

@ -0,0 +1 @@
Fixed dockermod version_info function for docker-py 6.0.0+

2
conf/master
View file

@ -51,7 +51,7 @@
# Key cache. Increases master speed for large numbers of accepted
# keys. Available options: 'sched'. (Updates on a fixed schedule.)
# Note that enabling this feature means that minions will not be
# available to target for up to the length of the maintanence loop
# available to target for up to the length of the maintenance loop
# which by default is 60s.
#key_cache: ''

2
conf/suse/master
View file

@ -49,7 +49,7 @@ syndic_user: salt
# Key cache. Increases master speed for large numbers of accepted
# keys. Available options: 'sched'. (Updates on a fixed schedule.)
# Note that enabling this feature means that minions will not be
# available to target for up to the length of the maintanence loop
# available to target for up to the length of the maintenance loop
# which by default is 60s.
#key_cache: ''

2
doc/man/salt-api.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-API" "1" "Jun 30, 2022" "3005" "Salt"
.TH "SALT-API" "1" "Sep 26, 2022" "3005.1" "Salt"
.SH NAME
salt-api \- salt-api Command
.

2
doc/man/salt-call.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CALL" "1" "Jun 30, 2022" "3005" "Salt"
.TH "SALT-CALL" "1" "Sep 26, 2022" "3005.1" "Salt"
.SH NAME
salt-call \- salt-call Documentation
.

2
doc/man/salt-cloud.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CLOUD" "1" "Jun 30, 2022" "3005" "Salt"
.TH "SALT-CLOUD" "1" "Sep 26, 2022" "3005.1" "Salt"
.SH NAME
salt-cloud \- Salt Cloud Command
.

2
doc/man/salt-cp.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CP" "1" "Jun 30, 2022" "3005" "Salt"
.TH "SALT-CP" "1" "Sep 26, 2022" "3005.1" "Salt"
.SH NAME
salt-cp \- salt-cp Documentation
.

2
doc/man/salt-key.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-KEY" "1" "Jun 30, 2022" "3005" "Salt"
.TH "SALT-KEY" "1" "Sep 26, 2022" "3005.1" "Salt"
.SH NAME
salt-key \- salt-key Documentation
.

2
doc/man/salt-master.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-MASTER" "1" "Jun 30, 2022" "3005" "Salt"
.TH "SALT-MASTER" "1" "Sep 26, 2022" "3005.1" "Salt"
.SH NAME
salt-master \- salt-master Documentation
.

2
doc/man/salt-minion.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-MINION" "1" "Jun 30, 2022" "3005" "Salt"
.TH "SALT-MINION" "1" "Sep 26, 2022" "3005.1" "Salt"
.SH NAME
salt-minion \- salt-minion Documentation
.

2
doc/man/salt-proxy.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-PROXY" "1" "Jun 30, 2022" "3005" "Salt"
.TH "SALT-PROXY" "1" "Sep 26, 2022" "3005.1" "Salt"
.SH NAME
salt-proxy \- salt-proxy Documentation
.

2
doc/man/salt-run.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-RUN" "1" "Jun 30, 2022" "3005" "Salt"
.TH "SALT-RUN" "1" "Sep 26, 2022" "3005.1" "Salt"
.SH NAME
salt-run \- salt-run Documentation
.

2
doc/man/salt-ssh.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-SSH" "1" "Jun 30, 2022" "3005" "Salt"
.TH "SALT-SSH" "1" "Sep 26, 2022" "3005.1" "Salt"
.SH NAME
salt-ssh \- salt-ssh Documentation
.

2
doc/man/salt-syndic.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-SYNDIC" "1" "Jun 30, 2022" "3005" "Salt"
.TH "SALT-SYNDIC" "1" "Sep 26, 2022" "3005.1" "Salt"
.SH NAME
salt-syndic \- salt-syndic Documentation
.

2
doc/man/salt.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT" "1" "Jun 30, 2022" "3005" "Salt"
.TH "SALT" "1" "Sep 26, 2022" "3005.1" "Salt"
.SH NAME
salt \- salt
.

1803
doc/man/salt.7
View file

File diff suppressed because it is too large Load diff

2
doc/man/spm.1
View file

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SPM" "1" "Jun 30, 2022" "3005" "Salt"
.TH "SPM" "1" "Sep 26, 2022" "3005.1" "Salt"
.SH NAME
spm \- Salt Package Manager Command
.

17
doc/ref/configuration/master.rst
View file

@ -1008,6 +1008,23 @@ is set to ``tcp`` by default on Windows.
ipc_mode: ipc
.. conf_master:: ipc_write_buffer
``ipc_write_buffer``
-----------------------
Default: ``0``
The maximum size of a message sent via the IPC transport module can be limited
dynamically or by sharing an integer value lower than the total memory size. When
the value ``dynamic`` is set, salt will use 2.5% of the total memory as
``ipc_write_buffer`` value (rounded to an integer). A value of ``0`` disables
this option.
.. code-block:: yaml
ipc_write_buffer: 10485760
.. conf_master:: tcp_master_pub_port
``tcp_master_pub_port``

19
doc/ref/configuration/minion.rst
View file

@ -177,7 +177,7 @@ The type of the :conf_minion:`master` variable. Can be ``str``, ``failover``,
master_type: str
If this option is ``str`` (default), multiple hot masters are configured.
If this option is ``str`` (default), multiple hot masters are configured.
Minions can connect to multiple masters simultaneously (all master are "hot").
.. code-block:: yaml
@ -1494,6 +1494,23 @@ process communications. ``ipc_mode`` is set to ``tcp`` on such systems.
ipc_mode: ipc
.. conf_minion:: ipc_write_buffer
``ipc_write_buffer``
-----------------------
Default: ``0``
The maximum size of a message sent via the IPC transport module can be limited
dynamically or by sharing an integer value lower than the total memory size. When
the value ``dynamic`` is set, salt will use 2.5% of the total memory as
``ipc_write_buffer`` value (rounded to an integer). A value of ``0`` disables
this option.
.. code-block:: yaml
ipc_write_buffer: 10485760
.. conf_minion:: tcp_pub_port
``tcp_pub_port``

2
doc/topics/cloud/azure.rst
View file

@ -1102,7 +1102,7 @@ Name of existing container.
signed_identifiers
``````````````````
SignedIdentifers instance
SignedIdentifiers instance
blob_public_access
``````````````````

2
doc/topics/cloud/windows.rst
View file

@ -13,7 +13,7 @@ Requirements
.. note::
Support ``winexe`` and ``impacket`` has been deprecated and will be removed in
3001. These dependencies are replaced by ``pypsexec`` and ``smbprotocol``
respectivly. These are pure python alternatives that are compatible with all
respectively. These are pure python alternatives that are compatible with all
supported python versions.
Salt Cloud makes use of `impacket` and `winexe` to set up the Windows Salt

2
doc/topics/community/index.rst
View file

@ -20,7 +20,7 @@ is hosted by Google Groups. It is open to new members.
.. _`salt-users mailing list`: https://groups.google.com/forum/#!forum/salt-users
Additionally, all users of Salt should be subscribed to the Announcements mailing
list which contains important updates about Salt, such as new releaes and
list which contains important updates about Salt, such as new releases and
security-related announcements. This list is low-traffic.
.. _`salt-announce mailing list`: https://groups.google.com/forum/#!forum/salt-announce

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

@ -160,7 +160,7 @@ New modules must be added to the index manually.
:blob:`state modules<doc/ref/states/all/index.rst>`,
:blob:`renderer modules <doc/ref/renderers/all/index.rst>`, etc.
2. Add the new module to the alphebetized list.
2. Add the new module to the alphabetized list.
3. :ref:`Build the documentation <docs-building>` which will generate an ``.rst``
file for the new module in the same directory as the ``index.rst``.

2
doc/topics/development/conventions/formulas.rst
View file

@ -598,7 +598,7 @@ Avoid heavy logic and programming
`````````````````````````````````
Jinja is not Python. It was made by Python programmers and shares many
semantics and some syntax but it does not allow for abitrary Python function
semantics and some syntax but it does not allow for arbitrary Python function
calls or Python imports. Jinja is a fast and efficient templating language but
the syntax can be verbose and visually noisy.

2
doc/topics/development/conventions/release.rst
View file

@ -32,7 +32,7 @@ example):
#. Announce new RC to salt-users and salt-announce google groups.
#. Triage incoming issues based on the new RC release.
#. Fix RC issues once they are categorized as a release blocker.
#. Depending on the issues found during the RC process make a decesion
#. Depending on the issues found during the RC process make a decision
on whether to release based off the RC or go through another RC process
#. If a RC is categorized as stable, build all required packages.
#. Test all release packages.

2
doc/topics/development/reporting_bugs.rst
View file

@ -23,7 +23,7 @@ In an issue report, please include the following information:
* Any configuration options set in a configuration file that may be relevant.
* A reproduceable test case. This may be as simple as an SLS file that
* A reproducible test case. This may be as simple as an SLS file that
illustrates a problem or it may be a link to a repository that contains a
number of SLS files that can be used together to re-produce a problem. If
the problem is transitory, any information that can be used to try and

2
doc/topics/highavailability/index.rst
View file

@ -44,7 +44,7 @@ REQUIRED to use failover.
Multimaster with PKI and Failover is discussed in
:ref:`this tutorial <tutorial-multi-master-pki>`
``master_type: failover`` can be combined with ``master_shuffle: True``
``master_type: failover`` can be combined with ``random_master: True``
to spread minion connections across all masters (one master per
minion, not each minion connecting to all masters). Adding Salt Syndics
into the mix makes it possible to create a load-balanced Salt infrastructure.

30
doc/topics/jinja/index.rst
View file

@ -1144,7 +1144,7 @@ Example:
This option may have adverse effects when using the default renderer,
``jinja|yaml``. This is due to the fact that YAML requires proper handling
in regard to special characters. Please see the section on :ref:`YAML ASCII
support <yaml_plain_ascii>` in the :ref:`YAML Idiosyncracies
support <yaml_plain_ascii>` in the :ref:`YAML Idiosyncrasies
<yaml-idiosyncrasies>` documentation for more information.
.. jinja_ref:: json_decode_list
@ -1889,6 +1889,28 @@ Returns:
["fe80::"]
.. jinja_ref:: ipwrap
``ipwrap``
----------
.. versionadded:: 3006.0
From a string, list, or tuple, returns any IPv6 addresses wrapped in square brackets([])
Example:
.. code-block:: jinja
{{ ['192.0.2.1', 'foo', 'bar', 'fe80::', '2001:db8::1/64'] | ipwrap }}
Returns:
.. code-block:: python
["192.0.2.1", "foo", "bar", "[fe80::]", "[2001:db8::1]/64"]
.. jinja_ref:: network_hosts
``network_hosts``
@ -1988,7 +2010,7 @@ Example:
This option may have adverse effects when using the default renderer,
``jinja|yaml``. This is due to the fact that YAML requires proper handling
in regard to special characters. Please see the section on :ref:`YAML ASCII
support <yaml_plain_ascii>` in the :ref:`YAML Idiosyncracies
support <yaml_plain_ascii>` in the :ref:`YAML Idiosyncrasies
<yaml-idiosyncrasies>` documentation for more information.
.. jinja_ref:: dns_check
@ -2366,8 +2388,8 @@ external template file.
.. note::
Macros and variables can be shared across templates. They should not be
starting with one or more underscores, and should be managed by one of the
Macros and variables can be shared across templates. They should not start
with one or more underscores, and should be managed by one of the
following tags: `macro`, `set`, `load_yaml`, `load_json`, `import_yaml` and
`import_json`.

4
doc/topics/pillar/index.rst
View file

@ -522,7 +522,7 @@ The :py:func:`pillar.get <salt.modules.pillar.get>` Function
The :mod:`pillar.get <salt.modules.pillar.get>` function works much in the same
way as the ``get`` method in a python dict, but with an enhancement: nested
dictonaries can be traversed using a colon as a delimiter.
dictionaries can be traversed using a colon as a delimiter.
If a structure like this is in pillar:
@ -706,7 +706,7 @@ The following functions support passing pillar data on the CLI via the
- :py:func:`state.highstate <salt.modules.state.highstate>`
- :py:func:`state.sls <salt.modules.state.sls>`
Triggerring decryption of this CLI pillar data can be done in one of two ways:
Triggering decryption of this CLI pillar data can be done in one of two ways:
1. Using the ``pillar_enc`` argument:

2
doc/topics/proxyminion/demo.rst
View file

@ -100,7 +100,7 @@ the 'url' key above should say ``url: http://127.0.0.1:8000``
8. The REST service implements a degenerately simple pkg and service provider as
well as a small set of grains. To "install" a package, use a standard
``pkg.install``. If you pass '==' and a verrsion number after the package
``pkg.install``. If you pass '==' and a version number after the package
name then the service will parse that and accept that as the package's
version.

2
doc/topics/proxyminion/ssh.rst
View file

@ -76,6 +76,6 @@ from the file ``/srv/pillar/p8000.sls`` (if you have not changed your default pi
8. The SSH shell implements a degenerately simple pkg.
To "install" a package, use a standard
``pkg.install``. If you pass '==' and a verrsion number after the package
``pkg.install``. If you pass '==' and a version number after the package
name then the service will parse that and accept that as the package's
version.

2
doc/topics/reactor/index.rst
View file

@ -99,7 +99,7 @@ API and the runner system. In this example, a command is published to the
- mods: orchestrate.runit
{% endif %}
This example will execute the state.orchestrate runner and intiate an execution
This example will execute the state.orchestrate runner and initiate an execution
of the ``runit`` orchestrator located at ``/srv/salt/orchestrate/runit.sls``.
Types of Reactions

30
doc/topics/releases/3005.1.rst Normal file
View file

@ -0,0 +1,30 @@
.. _release-3005-1:
=========================
Salt 3005.1 Release Notes
=========================
Version 3005.1 is a bug fix release for :ref:`3005 <release-3005>`.
Fixed
-----
- Fix arch parsing issue in apt source files (#62247)
- Fixed parsing CDROM apt sources (#62474)
- Use str() method instead of repo_line for when python3-apt is installed or not in aptpkg.py. (#62546)
- Remove the connection_timeout from netmiko_connection_args before netmiko_connection_args is added to __context__["netmiko_device"]["args"] which is passed along to the Netmiko library. (#62547)
- fixes #62553 by checking for disabled master_type before starting master connection and skipping it if set. (#62553)
- Fix runas with cmd module when using the onedir bundled packages (#62565)
- Fix the Pyinstaller hooks to preserve the environment if None is passed. (#62567, #62628)
- pkgrepo.managed sets wrong permissions on keys installed to /etc/apt/keyring (#62569)
- pkgrepo.managed creates zero byte gpg files when dearmoring contents to the same filename (#62570)
- Ensure default values for IPC Buffers are correct type (#62591)
- Fix a hang on salt-ssh when using sudo. (#62603)
- Renderers now have access to the correct set of salt functions. (#62610, #62620)
- Fix including Jinja template from absolute path (#62611)
- include jmespath in package requirements (#62613)
- Fix pkgrepo.managed signed-by in test=true mode (#62662)
- Ensure the status of the service is captured when the beacon function is called, even when the event is not being emitted. (#62675)
- The sub proxies controlled by Deltaproxy need to have their own req_channel otherwise there are timeout exceptions when the __master_req_channel_payload is fired and reacted on. (#62708)

2
doc/topics/solaris/solaris-specific-behavior.rst
View file

@ -19,7 +19,7 @@ issue on github: #37027
Grains
=========================
Not all grains are available or some have empty or 0 as value. Mostly grains
that are depenend on hardware discovery like:
that are dependent on hardware discovery like:
- num_gpus
- gpus

6
doc/topics/ssh/ssh_ext_alternatives.rst
View file

@ -8,7 +8,7 @@ In the 2019.2.0 release the ``ssh_ext_alternatives`` feature was added.
This allows salt-ssh to work across different supported python versions. You will
need to ensure you have the following:
- Salt is installed, with all required dependnecies for the Python version.
- Salt is installed, with all required dependencies for the Python version.
- Everything needs to be importable from the respective Python environment.
To enable using this feature you will need to edit the master configuration similar
@ -56,7 +56,7 @@ does not require you to define them under ``dependencies``.
py_bin: /usr/bin/python2.7 # Python binary path used to auto detect dependencies
If ``py_bin`` is not set alongside ``auto_detect``, it will attempt to auto detect
the dependnecies using the major version set in ``py-version``. For example if you
the dependencies using the major version set in ``py-version``. For example if you
have ``[2, 7]`` set as your ``py-version``, it will attempt to use the binary ``python2``.
You can also use ``auto_detect`` and ``dependencies`` together.
@ -72,7 +72,7 @@ You can also use ``auto_detect`` and ``dependencies`` together.
dependencies: # List of dependencies and their installation paths
jinja2: /opt/jinja2
If a dependency is defined in the ``dependecies`` list ``ssh_ext_alternatives`` will use
If a dependency is defined in the ``dependencies`` list ``ssh_ext_alternatives`` will use
this dependency, instead of the path that ``auto_detect`` finds. For example, if you define
``/opt/jinja2`` under your ``dependencies`` for jinja2, it will not try to autodetect the
file path to the jinja2 module, and will favor ``/opt/jinja2``.

9
doc/topics/topology/syndic.rst
View file

@ -21,6 +21,15 @@ node and the local ``salt-master`` daemon. This gives the Master node control
over the Minion nodes attached to the ``salt-master`` daemon running on the
Syndic node.
.. warning::
Salt does not officially support Syndic and :ref:`external auth or
publisher_acl<acl-eauth>`. It's possible that it might work under certain
circumstances, but comprehensive support is lacking. See `issue #62618 on
GitHub <https://github.com/saltstack/salt/issues/62618>`_ for more
information. Currently Syndic is only expected to work when running Salt as
root, though work is scheduled to fix this in Salt 3006 (Sulfur).
Configuring the Syndic
======================

2
doc/topics/tutorials/intro_scale.rst
View file

@ -282,7 +282,7 @@ that information back to the waiting client before the job can be published.
To mitigate this, a key cache may be enabled. This will reduce the load
on the master to a single file open instead of thousands or tens of thousands.
This cache is updated by the maintanence process, however, which means that
This cache is updated by the maintenance process, however, which means that
minions with keys that are accepted may not be targeted by the master
for up to sixty seconds by default.

2
doc/topics/tutorials/multimaster_pki.rst
View file

@ -192,7 +192,7 @@ in the order they are defined. To randomize that order, set
.. code-block:: yaml
master_shuffle: True
random_master: True
The master-list will then be shuffled before the first connection attempt.

11
noxfile.py
View file

@ -34,7 +34,7 @@ CI_RUN = (
PIP_INSTALL_SILENT = CI_RUN is False
SKIP_REQUIREMENTS_INSTALL = os.environ.get("SKIP_REQUIREMENTS_INSTALL", "0") == "1"
EXTRA_REQUIREMENTS_INSTALL = os.environ.get("EXTRA_REQUIREMENTS_INSTALL")
COVERAGE_REQUIREMENT = os.environ.get("COVERAGE_REQUIREMENT") or "coverage==5.2"
COVERAGE_REQUIREMENT = os.environ.get("COVERAGE_REQUIREMENT")
# Global Path Definitions
REPO_ROOT = pathlib.Path(os.path.dirname(__file__)).resolve()
@ -307,8 +307,15 @@ def _install_requirements(
def _run_with_coverage(session, *test_cmd, env=None):
if SKIP_REQUIREMENTS_INSTALL is False:
coverage_requirement = COVERAGE_REQUIREMENT
if coverage_requirement is None:
version_info = _get_session_python_version_info(session)
if version_info < (3, 7):
coverage_requirement = "coverage==6.2"
else:
coverage_requirement = "coverage==6.5.0"
session.install(
"--progress-bar=off", COVERAGE_REQUIREMENT, silent=PIP_INSTALL_SILENT
"--progress-bar=off", coverage_requirement, silent=PIP_INSTALL_SILENT
)
session.run("coverage", "erase")
python_path_env_var = os.environ.get("PYTHONPATH") or None

1
requirements/base.txt
View file

@ -1,4 +1,5 @@
Jinja2
jmespath
msgpack>=0.5,!=0.5.5
PyYAML
MarkupSafe

3
requirements/static/ci/common.in
View file

@ -18,8 +18,7 @@ etcd3-py==0.1.6 ; python_version >= '3.6'
gitpython>=2.1.15
jmespath
jsonschema
junos-eznc==2.4.0; sys_platform != 'win32' and python_version <= '3.9'
junos-eznc==2.6.0; sys_platform != 'win32' and python_version >= '3.10'
junos-eznc; sys_platform != 'win32' and python_version <= '3.10'
jxmlease; sys_platform != 'win32'
kazoo; sys_platform != 'win32' and sys_platform != 'darwin'
keyring==5.7.1

3
requirements/static/ci/py3.10/cloud.txt
View file

@ -463,12 +463,13 @@ jinja2==3.0.3
# moto
jmespath==0.10.0
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.6.0 ; sys_platform != "win32" and python_version >= "3.10"
junos-eznc==2.6.0 ; sys_platform != "win32" and python_version <= "3.10"
# via -r requirements/static/ci/common.in
jxmlease==1.0.3 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in

3
requirements/static/ci/py3.10/darwin.txt
View file

@ -466,12 +466,13 @@ jinja2==3.1.0
# moto
jmespath==0.9.4
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.6.0 ; sys_platform != "win32" and python_version >= "3.10"
junos-eznc==2.6.0 ; sys_platform != "win32" and python_version <= "3.10"
# via -r requirements/static/ci/common.in
jxmlease==1.0.1 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in

3
requirements/static/ci/py3.10/docs.txt
View file

@ -472,12 +472,13 @@ jinja2==3.0.3
# sphinx
jmespath==0.10.0
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.6.0 ; sys_platform != "win32" and python_version >= "3.10"
junos-eznc==2.6.0 ; sys_platform != "win32" and python_version <= "3.10"
# via -r requirements/static/ci/common.in
jxmlease==1.0.3 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in

3
requirements/static/ci/py3.10/freebsd.txt
View file

@ -461,12 +461,13 @@ jinja2==3.1.0
# moto
jmespath==0.9.4
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.6.0 ; sys_platform != "win32" and python_version >= "3.10"
junos-eznc==2.6.0 ; sys_platform != "win32" and python_version <= "3.10"
# via -r requirements/static/ci/common.in
jxmlease==1.0.1 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in

3
requirements/static/ci/py3.10/lint.txt
View file

@ -464,12 +464,13 @@ jinja2==3.0.3
# moto
jmespath==0.10.0
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.6.0 ; sys_platform != "win32" and python_version >= "3.10"
junos-eznc==2.6.0 ; sys_platform != "win32" and python_version <= "3.10"
# via -r requirements/static/ci/common.in
jxmlease==1.0.3 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in

3
requirements/static/ci/py3.10/linux.txt
View file

@ -478,12 +478,13 @@ jinja2==3.1.0
# moto
jmespath==0.9.4
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.6.0 ; sys_platform != "win32" and python_version >= "3.10"
junos-eznc==2.6.0 ; sys_platform != "win32" and python_version <= "3.10"
# via -r requirements/static/ci/common.in
jxmlease==1.0.1 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in

10
requirements/static/ci/py3.5/linux-crypto.txt
View file

@ -1,10 +0,0 @@
#
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=requirements/static/ci/py3.5/linux-crypto.txt --pip-args='--constraint=requirements/static/ci/py3.5/linux.txt' requirements/static/ci/crypto.in
#
m2crypto==0.38.0
# via -r requirements/static/ci/crypto.in
pycryptodome==3.9.7
# via -r requirements/static/ci/crypto.in

971
requirements/static/ci/py3.5/linux.txt
View file

@ -1,971 +0,0 @@
#
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=requirements/static/ci/py3.5/linux.txt --pip-args='--constraint=requirements/static/pkg/py3.5/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/linux.in requirements/static/pkg/linux.in requirements/zeromq.txt
#
adal==1.2.3
# via
# azure-datalake-store
# msrestazure
ansible-core==2.11.7
# via ansible
ansible==4.4.0
# via -r requirements/static/ci/linux.in
apache-libcloud==2.5.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
asn1crypto==1.3.0
# via
# certvalidator
# oscrypto
attrs==20.3.0
# via
# jsonschema
# pytest
# pytest-salt-factories
# pytest-shell-utilities
# pytest-skip-markers
# pytest-system-statistics
aws-sam-translator==1.33.0
# via cfn-lint
aws-xray-sdk==0.95
# via moto
azure-applicationinsights==0.1.0
# via azure
azure-batch==4.1.3
# via azure
azure-common==1.1.18
# via
# azure-applicationinsights
# azure-batch
# azure-cosmosdb-table
# azure-eventgrid
# azure-graphrbac
# azure-keyvault
# azure-loganalytics
# azure-mgmt-advisor
# azure-mgmt-applicationinsights
# azure-mgmt-authorization
# azure-mgmt-batch
# azure-mgmt-batchai
# azure-mgmt-billing
# azure-mgmt-cdn
# azure-mgmt-cognitiveservices
# azure-mgmt-commerce
# azure-mgmt-compute
# azure-mgmt-consumption
# azure-mgmt-containerinstance
# azure-mgmt-containerregistry
# azure-mgmt-containerservice
# azure-mgmt-cosmosdb
# azure-mgmt-datafactory
# azure-mgmt-datalake-analytics
# azure-mgmt-datalake-store
# azure-mgmt-datamigration
# azure-mgmt-devspaces
# azure-mgmt-devtestlabs
# azure-mgmt-dns
# azure-mgmt-eventgrid
# azure-mgmt-eventhub
# azure-mgmt-hanaonazure
# azure-mgmt-iotcentral
# azure-mgmt-iothub
# azure-mgmt-iothubprovisioningservices
# azure-mgmt-keyvault
# azure-mgmt-loganalytics
# azure-mgmt-logic
# azure-mgmt-machinelearningcompute
# azure-mgmt-managementgroups
# azure-mgmt-managementpartner
# azure-mgmt-maps
# azure-mgmt-marketplaceordering
# azure-mgmt-media
# azure-mgmt-monitor
# azure-mgmt-msi
# azure-mgmt-network
# azure-mgmt-notificationhubs
# azure-mgmt-policyinsights
# azure-mgmt-powerbiembedded
# azure-mgmt-rdbms
# azure-mgmt-recoveryservices
# azure-mgmt-recoveryservicesbackup
# azure-mgmt-redis
# azure-mgmt-relay
# azure-mgmt-reservations
# azure-mgmt-resource
# azure-mgmt-scheduler
# azure-mgmt-search
# azure-mgmt-servicebus
# azure-mgmt-servicefabric
# azure-mgmt-signalr
# azure-mgmt-sql
# azure-mgmt-storage
# azure-mgmt-subscription
# azure-mgmt-trafficmanager
# azure-mgmt-web
# azure-servicebus
# azure-servicefabric
# azure-servicemanagement-legacy
# azure-storage-blob
# azure-storage-common
# azure-storage-file
# azure-storage-queue
azure-cosmosdb-nspkg==2.0.2
# via azure-cosmosdb-table
azure-cosmosdb-table==1.0.5
# via azure
azure-datalake-store==0.0.44
# via azure
azure-eventgrid==1.2.0
# via azure
azure-graphrbac==0.40.0
# via azure
azure-keyvault==1.1.0
# via azure
azure-loganalytics==0.1.0
# via azure
azure-mgmt-advisor==1.0.1
# via azure-mgmt
azure-mgmt-applicationinsights==0.1.1
# via azure-mgmt
azure-mgmt-authorization==0.50.0
# via azure-mgmt
azure-mgmt-batch==5.0.1
# via azure-mgmt
azure-mgmt-batchai==2.0.0
# via azure-mgmt
azure-mgmt-billing==0.2.0
# via azure-mgmt
azure-mgmt-cdn==3.1.0
# via azure-mgmt
azure-mgmt-cognitiveservices==3.0.0
# via azure-mgmt
azure-mgmt-commerce==1.0.1
# via azure-mgmt
azure-mgmt-compute==4.6.0
# via azure-mgmt
azure-mgmt-consumption==2.0.0
# via azure-mgmt
azure-mgmt-containerinstance==1.4.1
# via azure-mgmt
azure-mgmt-containerregistry==2.7.0
# via azure-mgmt
azure-mgmt-containerservice==4.4.0
# via azure-mgmt
azure-mgmt-cosmosdb==0.4.1
# via azure-mgmt
azure-mgmt-datafactory==0.6.0
# via azure-mgmt
azure-mgmt-datalake-analytics==0.6.0
# via azure-mgmt
azure-mgmt-datalake-nspkg==3.0.1
# via
# azure-mgmt-datalake-analytics
# azure-mgmt-datalake-store
azure-mgmt-datalake-store==0.5.0
# via azure-mgmt
azure-mgmt-datamigration==1.0.0
# via azure-mgmt
azure-mgmt-devspaces==0.1.0
# via azure-mgmt
azure-mgmt-devtestlabs==2.2.0
# via azure-mgmt
azure-mgmt-dns==2.1.0
# via azure-mgmt
azure-mgmt-eventgrid==1.0.0
# via azure-mgmt
azure-mgmt-eventhub==2.5.0
# via azure-mgmt
azure-mgmt-hanaonazure==0.1.1
# via azure-mgmt
azure-mgmt-iotcentral==0.1.0
# via azure-mgmt
azure-mgmt-iothub==0.5.0
# via azure-mgmt
azure-mgmt-iothubprovisioningservices==0.2.0
# via azure-mgmt
azure-mgmt-keyvault==1.1.0
# via azure-mgmt
azure-mgmt-loganalytics==0.2.0
# via azure-mgmt
azure-mgmt-logic==3.0.0
# via azure-mgmt
azure-mgmt-machinelearningcompute==0.4.1
# via azure-mgmt
azure-mgmt-managementgroups==0.1.0
# via azure-mgmt
azure-mgmt-managementpartner==0.1.0
# via azure-mgmt
azure-mgmt-maps==0.1.0
# via azure-mgmt
azure-mgmt-marketplaceordering==0.1.0
# via azure-mgmt
azure-mgmt-media==1.0.0
# via azure-mgmt
azure-mgmt-monitor==0.5.2
# via azure-mgmt
azure-mgmt-msi==0.2.0
# via azure-mgmt
azure-mgmt-network==2.6.0
# via azure-mgmt
azure-mgmt-notificationhubs==2.0.0
# via azure-mgmt
azure-mgmt-nspkg==3.0.2
# via
# azure-mgmt-advisor
# azure-mgmt-applicationinsights
# azure-mgmt-authorization
# azure-mgmt-batch
# azure-mgmt-batchai
# azure-mgmt-billing
# azure-mgmt-cognitiveservices
# azure-mgmt-commerce
# azure-mgmt-consumption
# azure-mgmt-cosmosdb
# azure-mgmt-datafactory
# azure-mgmt-datalake-nspkg
# azure-mgmt-datamigration
# azure-mgmt-devspaces
# azure-mgmt-devtestlabs
# azure-mgmt-dns
# azure-mgmt-eventgrid
# azure-mgmt-hanaonazure
# azure-mgmt-iotcentral
# azure-mgmt-iothub
# azure-mgmt-iothubprovisioningservices
# azure-mgmt-keyvault
# azure-mgmt-loganalytics
# azure-mgmt-logic
# azure-mgmt-machinelearningcompute
# azure-mgmt-managementgroups
# azure-mgmt-managementpartner
# azure-mgmt-maps
# azure-mgmt-marketplaceordering
# azure-mgmt-monitor
# azure-mgmt-msi
# azure-mgmt-notificationhubs
# azure-mgmt-policyinsights
# azure-mgmt-powerbiembedded
# azure-mgmt-recoveryservices
# azure-mgmt-recoveryservicesbackup
# azure-mgmt-redis
# azure-mgmt-relay
# azure-mgmt-reservations
# azure-mgmt-scheduler
# azure-mgmt-search
# azure-mgmt-servicefabric
# azure-mgmt-signalr
# azure-mgmt-sql
# azure-mgmt-storage
# azure-mgmt-subscription
# azure-mgmt-trafficmanager
# azure-mgmt-web
azure-mgmt-policyinsights==0.1.0
# via azure-mgmt
azure-mgmt-powerbiembedded==2.0.0
# via azure-mgmt
azure-mgmt-rdbms==1.8.0
# via azure-mgmt
azure-mgmt-recoveryservices==0.3.0
# via azure-mgmt
azure-mgmt-recoveryservicesbackup==0.3.0
# via azure-mgmt
azure-mgmt-redis==5.0.0
# via azure-mgmt
azure-mgmt-relay==0.1.0
# via azure-mgmt
azure-mgmt-reservations==0.2.1
# via azure-mgmt
azure-mgmt-resource==2.1.0
# via azure-mgmt
azure-mgmt-scheduler==2.0.0
# via azure-mgmt
azure-mgmt-search==2.0.0
# via azure-mgmt
azure-mgmt-servicebus==0.5.3
# via azure-mgmt
azure-mgmt-servicefabric==0.2.0
# via azure-mgmt
azure-mgmt-signalr==0.1.1
# via azure-mgmt
azure-mgmt-sql==0.9.1
# via azure-mgmt
azure-mgmt-storage==2.0.0
# via azure-mgmt
azure-mgmt-subscription==0.2.0
# via azure-mgmt
azure-mgmt-trafficmanager==0.50.0
# via azure-mgmt
azure-mgmt-web==0.35.0
# via azure-mgmt
azure-mgmt==4.0.0
# via azure
azure-nspkg==3.0.2
# via
# azure-applicationinsights
# azure-batch
# azure-cosmosdb-nspkg
# azure-eventgrid
# azure-graphrbac
# azure-keyvault
# azure-loganalytics
# azure-mgmt-nspkg
# azure-servicebus
# azure-servicefabric
# azure-servicemanagement-legacy
azure-servicebus==0.21.1
# via azure
azure-servicefabric==6.3.0.0
# via azure
azure-servicemanagement-legacy==0.20.6
# via azure
azure-storage-blob==1.5.0
# via azure
azure-storage-common==1.4.0
# via
# azure-cosmosdb-table
# azure-storage-blob
# azure-storage-file
# azure-storage-queue
azure-storage-file==1.4.0
# via azure
azure-storage-queue==1.4.0
# via azure
azure==4.0.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
backports.entry-points-selectable==1.1.0
# via virtualenv
backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
# via -r requirements/static/pkg/linux.in
bcrypt==3.1.6
# via paramiko
boto3==1.16.63 ; python_version < "3.6"
# via
# -r requirements/static/ci/common.in
# aws-sam-translator
# moto
boto==2.49.0
# via
# -r requirements/static/ci/common.in
# moto
botocore==1.19.63
# via
# boto3
# moto
# s3transfer
cachetools==3.1.0
# via google-auth
cassandra-driver==3.23.0
# via -r requirements/static/ci/common.in
certifi==2021.10.8
# via
# -r requirements/static/ci/common.in
# kubernetes
# msrest
# python-telegram-bot
# requests
certvalidator==0.11.1
# via vcert
cffi==1.14.6
# via
# -r requirements/static/ci/common.in
# azure-datalake-store
# bcrypt
# cryptography
# pygit2
# pynacl
cfn-lint==0.44.3
# via moto
chardet==3.0.4
# via requests
cheetah3==3.2.6.post2
# via -r requirements/static/ci/common.in
cheroot==8.5.2
# via cherrypy
cherrypy==18.6.1
# via
# -r requirements/static/ci/common.in
# -r requirements/static/pkg/linux.in
click==7.1.1
# via geomet
clustershell==1.8.3
# via -r requirements/static/ci/common.in
contextvars==2.4
# via -r requirements/base.txt
croniter==0.3.29 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
cryptography==3.0
# via
# adal
# ansible-core
# azure-cosmosdb-table
# azure-keyvault
# azure-storage-common
# moto
# paramiko
# pyopenssl
# python-jose
# python-telegram-bot
# sshpubkeys
# vcert
decorator==4.4.2
# via
# networkx
# python-telegram-bot
distlib==0.3.2
# via virtualenv
distro==1.5.0
# via
# -r requirements/base.txt
# pytest-skip-markers
dnspython==1.16.0
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==4.4.4
# via
# -r requirements/static/ci/common.in
# moto
# pytest-salt-factories
ecdsa==0.14.1
# via
# moto
# python-jose
# sshpubkeys
filelock==3.0.12
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
future==0.17.1
# via textfsm
genshi==0.7.5
# via -r requirements/static/ci/common.in
geomet==0.1.2
# via cassandra-driver
gitdb==4.0.5
# via gitpython
gitpython==3.1.12
# via -r requirements/static/ci/common.in
google-auth==1.6.3
# via kubernetes
hglib==2.6.1
# via -r requirements/static/ci/linux.in
idna==2.8
# via
# moto
# requests
immutables==0.14
# via contextvars
importlib-metadata==0.23
# via
# backports.entry-points-selectable
# importlib-resources
# jsonpickle
# jsonschema
# pluggy
# pytest
# virtualenv
importlib-resources==1.5.0
# via
# cfn-lint
# jaraco.text
# virtualenv
iniconfig==1.0.1
# via pytest
ipaddress==1.0.22
# via kubernetes
isodate==0.6.0
# via msrest
jaraco.classes==2.0
# via jaraco.collections
jaraco.collections==2.1
# via cherrypy
jaraco.functools==2.0
# via
# cheroot
# jaraco.text
# tempora
jaraco.text==3.2.0
# via jaraco.collections
jinja2==2.11.3
# via
# -r requirements/base.txt
# ansible-core
# junos-eznc
# moto
jmespath==0.9.4
# via
# -r requirements/static/ci/common.in
# boto3
# botocore
jsondiff==1.2.0
# via moto
jsonpatch==1.28
# via cfn-lint
jsonpickle==2.0.0
# via aws-xray-sdk
jsonpointer==2.0
# via jsonpatch
jsonschema==3.2.0
# via
# -r requirements/static/ci/common.in
# aws-sam-translator
# cfn-lint
junit-xml==1.9
# via cfn-lint
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
# via -r requirements/static/ci/common.in
jxmlease==1.0.1 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
kazoo==2.6.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
keyring==5.7.1
# via -r requirements/static/ci/common.in
kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
lxml==4.9.1
# via
# junos-eznc
# ncclient
mako==1.1.4
# via -r requirements/static/ci/common.in
markupsafe==1.1.1
# via
# -r requirements/base.txt
# jinja2
# mako
# moto
mercurial==6.0.1
# via -r requirements/static/ci/linux.in
mock==3.0.5
# via
# -r requirements/pytest.txt
# moto
more-itertools==5.0.0
# via
# cheroot
# cherrypy
# jaraco.functools
# moto
# zipp
moto==1.3.16 ; python_version <= "3.5"
# via -r requirements/static/ci/common.in
msgpack==1.0.2
# via
# -r requirements/base.txt
# pytest-salt-factories
msrest==0.6.14
# via
# azure-applicationinsights
# azure-eventgrid
# azure-keyvault
# azure-loganalytics
# azure-mgmt-cdn
# azure-mgmt-compute
# azure-mgmt-containerinstance
# azure-mgmt-containerregistry
# azure-mgmt-containerservice
# azure-mgmt-dns
# azure-mgmt-eventhub
# azure-mgmt-keyvault
# azure-mgmt-media
# azure-mgmt-network
# azure-mgmt-rdbms
# azure-mgmt-resource
# azure-mgmt-servicebus
# azure-mgmt-servicefabric
# azure-mgmt-signalr
# azure-servicefabric
# msrestazure
msrestazure==0.6.3
# via
# azure-batch
# azure-eventgrid
# azure-graphrbac
# azure-keyvault
# azure-mgmt-advisor
# azure-mgmt-applicationinsights
# azure-mgmt-authorization
# azure-mgmt-batch
# azure-mgmt-batchai
# azure-mgmt-billing
# azure-mgmt-cdn
# azure-mgmt-cognitiveservices
# azure-mgmt-commerce
# azure-mgmt-compute
# azure-mgmt-consumption
# azure-mgmt-containerinstance
# azure-mgmt-containerregistry
# azure-mgmt-containerservice
# azure-mgmt-cosmosdb
# azure-mgmt-datafactory
# azure-mgmt-datalake-analytics
# azure-mgmt-datalake-store
# azure-mgmt-datamigration
# azure-mgmt-devspaces
# azure-mgmt-devtestlabs
# azure-mgmt-dns
# azure-mgmt-eventgrid
# azure-mgmt-eventhub
# azure-mgmt-hanaonazure
# azure-mgmt-iotcentral
# azure-mgmt-iothub
# azure-mgmt-iothubprovisioningservices
# azure-mgmt-keyvault
# azure-mgmt-loganalytics
# azure-mgmt-logic
# azure-mgmt-machinelearningcompute
# azure-mgmt-managementgroups
# azure-mgmt-managementpartner
# azure-mgmt-maps
# azure-mgmt-marketplaceordering
# azure-mgmt-media
# azure-mgmt-monitor
# azure-mgmt-msi
# azure-mgmt-network
# azure-mgmt-notificationhubs
# azure-mgmt-policyinsights
# azure-mgmt-powerbiembedded
# azure-mgmt-rdbms
# azure-mgmt-recoveryservices
# azure-mgmt-recoveryservicesbackup
# azure-mgmt-redis
# azure-mgmt-relay
# azure-mgmt-reservations
# azure-mgmt-resource
# azure-mgmt-scheduler
# azure-mgmt-search
# azure-mgmt-servicebus
# azure-mgmt-servicefabric
# azure-mgmt-signalr
# azure-mgmt-sql
# azure-mgmt-storage
# azure-mgmt-subscription
# azure-mgmt-trafficmanager
# azure-mgmt-web
ncclient==0.6.4
# via junos-eznc
netaddr==0.7.19
# via junos-eznc
networkx==2.4
# via cfn-lint
ntc-templates==1.4.0
# via junos-eznc
oauthlib==3.2.1
# via requests-oauthlib
oscrypto==1.2.0
# via certvalidator
packaging==19.2
# via
# ansible-core
# pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -r requirements/static/ci/common.in
# junos-eznc
# ncclient
# scp
passlib==1.7.2 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
pathlib2==2.3.5
# via pytest
pathspec==0.9.0
# via yamllint
pathtools==0.1.2
# via watchdog
platformdirs==2.0.2
# via virtualenv
pluggy==0.13.0
# via pytest
portend==2.4
# via cherrypy
psutil==5.8.0
# via
# -r requirements/base.txt
# pytest-salt-factories
# pytest-shell-utilities
# pytest-system-statistics
py==1.10.0
# via pytest
pyasn1-modules==0.2.4
# via google-auth
pyasn1==0.4.8
# via
# pyasn1-modules
# python-jose
# rsa
pycparser==2.17
# via cffi
pycryptodomex==3.9.8
# via -r requirements/crypto.txt
pycurl==7.43.0.6 ; python_version <= "3.9"
# via -r requirements/static/ci/common.in
pygit2==1.0.3 ; python_version <= "3.8"
# via -r requirements/static/ci/linux.in
pyiface==0.0.11
# via -r requirements/static/ci/linux.in
pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd"
# via -r requirements/static/ci/common.in
pyjwt==1.7.1
# via
# adal
# twilio
pymysql==0.9.3 ; python_version <= "3.5"
# via -r requirements/static/ci/linux.in
pynacl==1.3.0
# via paramiko
pyopenssl==19.1.0
# via -r requirements/static/pkg/linux.in
pyparsing==2.4.5
# via
# junos-eznc
# packaging
pyrsistent==0.17.3
# via jsonschema
pyserial==3.4
# via junos-eznc
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
# via
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.1
# via -r requirements/pytest.txt
pytest-salt-factories[docker]==1.0.0rc20 ; sys_platform != "win32"
# via -r requirements/pytest.txt
pytest-shell-utilities==1.6.0
# via pytest-salt-factories
pytest-skip-markers==1.2.0
# via
# pytest-salt-factories
# pytest-shell-utilities
# pytest-system-statistics
pytest-subtests==0.4.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==1.4.2
# via -r requirements/pytest.txt
pytest==6.1.2 ; python_version < "3.6"
# via
# -r requirements/pytest.txt
# pytest-custom-exit-code
# pytest-helpers-namespace
# pytest-salt-factories
# pytest-shell-utilities
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-consul==1.1.0
# via -r requirements/static/ci/linux.in
python-dateutil==2.8.1
# via
# -r requirements/static/pkg/linux.in
# adal
# azure-cosmosdb-table
# azure-storage-common
# botocore
# croniter
# kubernetes
# moto
# vcert
python-etcd==0.4.5
# via -r requirements/static/ci/common.in
python-gnupg==0.4.8
# via -r requirements/static/pkg/linux.in
python-jose[cryptography]==3.2.0
# via moto
python-telegram-bot==12.8 ; python_version <= "3.5"
# via -r requirements/static/ci/linux.in
pytz==2022.1
# via
# moto
# tempora
# twilio
pyvmomi==6.7.1.2018.12
# via -r requirements/static/ci/common.in
pyyaml==5.3.1
# via
# -r requirements/base.txt
# ansible-core
# cfn-lint
# clustershell
# junos-eznc
# kubernetes
# moto
# yamllint
# yamlordereddictloader
pyzmq==18.0.1 ; python_version < "3.9"
# via
# -r requirements/zeromq.txt
# pytest-salt-factories
redis-py-cluster==2.1.3
# via -r requirements/static/ci/linux.in
redis==3.5.3
# via redis-py-cluster
requests-oauthlib==1.3.0
# via msrest
requests==2.25.1
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# adal
# apache-libcloud
# aws-xray-sdk
# azure-cosmosdb-table
# azure-datalake-store
# azure-keyvault
# azure-servicebus
# azure-servicemanagement-legacy
# azure-storage-common
# docker
# kubernetes
# moto
# msrest
# python-consul
# pyvmomi
# requests-oauthlib
# responses
# twilio
# vcert
resolvelib==0.5.4
# via ansible-core
responses==0.10.6
# via moto
rfc3987==1.3.8
# via -r requirements/static/ci/common.in
rpm-vercmp==0.1.2
# via -r requirements/static/pkg/linux.in
rsa==4.7.2
# via
# google-auth
# python-jose
s3transfer==0.3.7
# via boto3
scp==0.13.2
# via junos-eznc
setproctitle==1.1.10 ; python_version < "3.10"
# via -r requirements/static/pkg/linux.in
six==1.16.0
# via
# aws-sam-translator
# bcrypt
# cassandra-driver
# cfn-lint
# cheroot
# cryptography
# docker
# ecdsa
# genshi
# geomet
# google-auth
# isodate
# jaraco.classes
# jaraco.collections
# jaraco.text
# jsonschema
# junit-xml
# junos-eznc
# kazoo
# kubernetes
# mock
# more-itertools
# moto
# ncclient
# packaging
# paramiko
# pathlib2
# pynacl
# pyopenssl
# python-consul
# python-dateutil
# python-jose
# pyvmomi
# responses
# tempora
# textfsm
# transitions
# twilio
# vcert
# virtualenv
# websocket-client
smmap==3.0.4
# via gitdb
sqlparse==0.4.2
# via -r requirements/static/ci/common.in
sshpubkeys==3.1.0
# via moto
strict-rfc3339==0.7
# via -r requirements/static/ci/common.in
tempora==1.14.1
# via portend
terminal==0.4.0
# via ntc-templates
textfsm==1.1.0
# via ntc-templates
timelib==0.2.5
# via -r requirements/static/pkg/linux.in
toml==0.10.2
# via
# -r requirements/static/ci/common.in
# pytest
tornado==6.1
# via python-telegram-bot
transitions==0.8.1
# via junos-eznc
twilio==6.63.2
# via -r requirements/static/ci/linux.in
typing-extensions==3.10.0.2
# via
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.6
# via
# botocore
# kubernetes
# python-etcd
# requests
vcert==0.7.4 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
virtualenv==20.7.2
# via
# -r requirements/static/ci/common.in
# pytest-salt-factories
watchdog==0.10.3
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
werkzeug==0.15.6
# via
# moto
# pytest-httpserver
wrapt==1.11.1
# via aws-xray-sdk
xmltodict==0.12.0
# via moto
yamllint==1.26.3
# via -r requirements/static/ci/linux.in
yamlordereddictloader==0.4.0
# via junos-eznc
zc.lockfile==1.4
# via cherrypy
zipp==0.6.0
# via
# importlib-metadata
# importlib-resources
# moto
# The following packages are considered to be unsafe in a requirements file:
# setuptools

3
requirements/static/ci/py3.6/cloud.txt
View file

@ -486,12 +486,13 @@ jinja2==3.0.3
# moto
jmespath==0.10.0
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via -r requirements/static/ci/common.in
jxmlease==1.0.3 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in

3
requirements/static/ci/py3.6/docs.txt
View file

@ -495,12 +495,13 @@ jinja2==3.0.3
# sphinx
jmespath==0.10.0
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via -r requirements/static/ci/common.in
jxmlease==1.0.3 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in

3
requirements/static/ci/py3.6/lint.txt
View file

@ -489,12 +489,13 @@ jinja2==3.0.3
# moto
jmespath==0.10.0
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via -r requirements/static/ci/common.in
jxmlease==1.0.3 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in

3
requirements/static/ci/py3.6/linux.txt
View file

@ -501,12 +501,13 @@ jinja2==3.0.3
# moto
jmespath==0.9.4
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via -r requirements/static/ci/common.in
jxmlease==1.0.1 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in

3
requirements/static/ci/py3.7/cloud.txt
View file

@ -485,12 +485,13 @@ jinja2==3.0.3
# napalm
jmespath==0.10.0
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via
# -r requirements/static/ci/common.in
# napalm

3
requirements/static/ci/py3.7/docs.txt
View file

@ -492,12 +492,13 @@ jinja2==3.0.3
# sphinx
jmespath==0.10.0
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via
# -r requirements/static/ci/common.in
# napalm

3
requirements/static/ci/py3.7/freebsd.txt
View file

@ -484,12 +484,13 @@ jinja2==3.1.0
# napalm
jmespath==0.9.4
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via
# -r requirements/static/ci/common.in
# napalm

3
requirements/static/ci/py3.7/lint.txt
View file

@ -486,12 +486,13 @@ jinja2==3.0.3
# napalm
jmespath==0.10.0
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via
# -r requirements/static/ci/common.in
# napalm

3
requirements/static/ci/py3.7/linux.txt
View file

@ -499,12 +499,13 @@ jinja2==3.1.0
# napalm
jmespath==0.9.4
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via
# -r requirements/static/ci/common.in
# napalm

1
requirements/static/ci/py3.7/windows.txt
View file

@ -159,6 +159,7 @@ jinja2==3.1.0
# moto
jmespath==0.9.4
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore

3
requirements/static/ci/py3.8/cloud.txt
View file

@ -474,12 +474,13 @@ jinja2==3.0.3
# napalm
jmespath==0.10.0
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via
# -r requirements/static/ci/common.in
# napalm

3
requirements/static/ci/py3.8/docs.txt
View file

@ -483,12 +483,13 @@ jinja2==3.0.3
# sphinx
jmespath==0.10.0
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via
# -r requirements/static/ci/common.in
# napalm

3
requirements/static/ci/py3.8/freebsd.txt
View file

@ -474,12 +474,13 @@ jinja2==3.1.0
# napalm
jmespath==0.9.4
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via
# -r requirements/static/ci/common.in
# napalm

3
requirements/static/ci/py3.8/lint.txt
View file

@ -477,12 +477,13 @@ jinja2==3.0.3
# napalm
jmespath==0.10.0
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via
# -r requirements/static/ci/common.in
# napalm

3
requirements/static/ci/py3.8/linux.txt
View file

@ -489,12 +489,13 @@ jinja2==3.1.0
# napalm
jmespath==0.9.4
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via
# -r requirements/static/ci/common.in
# napalm

1
requirements/static/ci/py3.8/windows.txt
View file

@ -147,6 +147,7 @@ jinja2==3.1.0
# moto
jmespath==0.9.4
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore

3
requirements/static/ci/py3.9/cloud.txt
View file

@ -474,12 +474,13 @@ jinja2==3.0.3
# napalm
jmespath==0.10.0
# via
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# boto3
# botocore
jsonschema==3.2.0
# via -r requirements/static/ci/common.in
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.9"
junos-eznc==2.4.0 ; sys_platform != "win32" and python_version <= "3.10"
# via
# -r requirements/static/ci/common.in
# napalm

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