.github/ISSUE_TEMPLATE/docs.md

@@ -0,0 +1,23 @@
+---
+name: Docs
+about: Issue related to Salt Documentation
+title: "[DOCS]"
+labels: Documentation
+assignees: ''
+
+---
+
+**Description**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Suggested Fix**
+What did you expect to see in the documentation that is missing or needs updating?
+
+**Type of documentation**
+This could be Salt documentation, Salt modules, the Salt Repo or the Getting Started guide.
+
+**Location or format of documentation**
+Insert page URL if applicable.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/config.yml

@@ -0,0 +1,57 @@
+# Configuration for welcome - https://github.com/behaviorbot/welcome
+# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
+# Comment to be posted to on first time issues
+newIssueWelcomeComment: >
+  Hi there! Welcome to the Salt Community! Thank you for making your first contribution. We have
+  a lengthy process for issues and PRs. Someone from the Core Team will follow up as soon as
+  possible. In the meantime, here’s some information that may help as you continue your Salt
+  journey.
+
+  Please be sure to review our [Code of Conduct](https://github.com/saltstack/salt/blob/master/CODE_OF_CONDUCT.md).
+  Also, check out some of our community
+  resources including:
+
+    - [Community Wiki](https://github.com/saltstack/community/wiki)
+    - [Salt’s Contributor Guide](https://docs.saltstack.com/en/latest/topics/development/contributing.html)
+    - [Join our Community Slack](https://saltstackcommunity.herokuapp.com/)
+    - [IRC on Freenode](https://webchat.freenode.net/#salt)
+    - [SaltStack YouTube channel](https://www.youtube.com/user/SaltStack)
+    - [SaltStackInc Twitch channel](https://www.twitch.tv/saltstackinc)
+
+  There are lots of ways to get involved in our community. Every month, there are around a dozen
+  opportunities to meet with other contributors and the Salt Core team and collaborate in real
+  time. The best way to keep track is by subscribing to the Salt Community Events Calendar.
+
+  If you have additional questions, email us at core@saltstack.com. We’re glad
+  you’ve joined our community and look forward to doing awesome things with
+  you!
+
+# Comment to be posted to on PRs from first time contributors in your repository
+newPRWelcomeComment: >
+  Hi there! Welcome to the Salt Community! Thank you for making your first contribution. We have
+  a lengthy process for issues and PRs. Someone from the Core Team will follow up as soon as
+  possible. In the meantime, here’s some information that may help as you continue your Salt
+  journey.
+
+  Please be sure to review our [Code of Conduct](https://github.com/saltstack/salt/blob/master/CODE_OF_CONDUCT.md).
+  Also, check out some of our community
+  resources including:
+
+    - [Community Wiki](https://github.com/saltstack/community/wiki)
+    - [Salt’s Contributor Guide](https://docs.saltstack.com/en/latest/topics/development/contributing.html)
+    - [Join our Community Slack](https://saltstackcommunity.herokuapp.com/)
+    - [IRC on Freenode](https://webchat.freenode.net/#salt)
+    - [SaltStack YouTube channel](https://www.youtube.com/user/SaltStack)
+    - [SaltStackInc Twitch channel](https://www.twitch.tv/saltstackinc)
+
+  There are lots of ways to get involved in our community. Every month, there are around a dozen
+  opportunities to meet with other contributors and the Salt Core team and collaborate in real
+  time. The best way to keep track is by subscribing to the Salt Community Events Calendar.
+
+  If you have additional questions, email us at core@saltstack.com. We’re glad
+  you’ve joined our community and look forward to doing awesome things with
+  you!
+
+# Comment to be posted to on pull requests merged by a first time user
+firstPRMergeComment: >
+  Congratulations on your first PR being merged! :tada:

.pre-commit-hooks/check-changelog-entries.py

@@ -0,0 +1,74 @@
+#!/usr/bin/env python3
+# pylint: skip-file
+
+import pathlib
+import re
+import sys
+
+CODE_ROOT = pathlib.Path(__file__).resolve().parent.parent
+DOCS_PATH = CODE_ROOT / "doc"
+TESTS_INTEGRATION_FILES_PATH = CODE_ROOT / "tests" / "integration" / "files"
+CHANGELOG_ENTRIES_PATH = CODE_ROOT / "changelog"
+CHANGELOG_LIKE_RE = re.compile(r"([\d]+)\.([a-z]+)$")
+CHANGELOG_EXTENSIONS = ("removed", "deprecated", "changed", "fixed", "added")
+CHANGELOG_ENTRY_RE = re.compile(r"[\d]+\.({})$".format("|".join(CHANGELOG_EXTENSIONS)))
+
+
+def check_changelog_entries(files):
+
+    exitcode = 0
+    for entry in files:
+        path = pathlib.Path(entry).resolve()
+        # Does it look like a changelog entry
+        if CHANGELOG_LIKE_RE.match(path.name) and not CHANGELOG_ENTRY_RE.match(
+            path.name
+        ):
+            try:
+                # Is this under doc/
+                path.relative_to(DOCS_PATH)
+                # Yes, carry on
+                continue
+            except ValueError:
+                # No, resume the check
+                pass
+            try:
+                # Is this under tests/integration/files
+                path.relative_to(TESTS_INTEGRATION_FILES_PATH)
+                # Yes, carry on
+                continue
+            except ValueError:
+                # No, resume the check
+                pass
+            print(
+                "The changelog entry '{}' should have one of the following extensions: {}.".format(
+                    path.relative_to(CODE_ROOT),
+                    ", ".join(repr(ext) for ext in CHANGELOG_EXTENSIONS),
+                ),
+                file=sys.stderr,
+                flush=True,
+            )
+            exitcode = 1
+            continue
+        # Is it a changelog entry
+        if not CHANGELOG_ENTRY_RE.match(path.name):
+            # No? Carry on
+            continue
+        # Is the changelog entry in the right path?
+        try:
+            path.relative_to(CHANGELOG_ENTRIES_PATH)
+        except ValueError:
+            exitcode = 1
+            print(
+                "The changelog entry '{}' should be placed under '{}/', not '{}'".format(
+                    path.name,
+                    CHANGELOG_ENTRIES_PATH.relative_to(CODE_ROOT),
+                    path.relative_to(CODE_ROOT).parent,
+                ),
+                file=sys.stderr,
+                flush=True,
+            )
+    sys.exit(exitcode)
+
+
+if __name__ == "__main__":
+    check_changelog_entries(sys.argv[1:])

.pylintrc

@@ -681,6 +681,7 @@ allowed-3rd-party-modules=msgpack,
                           libcloud,
                           zmq,
                           pytest,
+                          attr,
                           setuptools,
                           pytestsalt,
                           saltfactories,

.rstcheck.cfg

@@ -0,0 +1,27 @@
+[rstcheck]
+ignore_directives=
+  automodule,
+  autoclass,
+  autofunction,
+  conf_proxy,
+  conf_log,
+  conf_master,
+  conf_minion,
+  releasestree,
+  jinja_ref,
+  salt:event
+ignore_roles=
+  conf_master,
+  conf_minion,
+  conf_proxy,
+  conf_log,
+  formula_url,
+  issue,
+  pull,
+  blob,
+  jinja_ref
+ignore_substitutions=
+  saltrepo,
+  repo_primary_branch,
+  windownload,
+  osxdownloadpy3

AUTHORS

@@ -115,9 +115,9 @@ Growing Community
 --------------------------------
 
 Salt is a rapidly growing project with a large community, to view all
-contributors please check ohloh, this file can sometimes be out of date:
+contributors please check Github, this file can sometimes be out of date:
 
-https://www.ohloh.net/p/salt/contributors
+https://github.com/saltstack/salt/graphs/contributors
 
 To see current statistics check out the GitHub Pulse page:
 

CHANGELOG.md

@@ -7,6 +7,235 @@ Versions are `MAJOR.PATCH`.
 
 # Changelog
 
+Salt 3002 (2020-10-19)
+======================
+
+Removed
+-------
+
+- removed boto_vpc.describe_route_table please use boto_vpc.describe_route_tables (#58636)
+- removed show_ipv4 arg from all functions in from salt.runners.manage (#58638)
+- removed kwargs from mandrill.send if you use "async" please use "asynchronous" (#58640)
+- removed salt/modules/mac_brew_pkg.__fix_cask_namespace (#58641)
+- zfs.mount Passing '-a' as name is deprecated please just pass 'None' (#58642)
+- Remove include_localhost kwarg for connected_ids method in salt/utils/minions.py (#58224)
+- deprecated opts default argument of none and removed deprecation warnings (#58635)
+
+
+Deprecated
+----------
+
+- The `ssh` parameter of `virt.migrate` has been deprecated. Use a libvirt URI `target` value instead. Both `virt.migrate_non_shared` and `virt.migrate_non_shared_inc` have been deprecated. Use the `copy_storage` parameter with `virt.migrate` instead. (#57947)
+
+
+Changed
+-------
+
+- Allow to specify a custom port for Proxmox connection (#50620)
+- Changed the lvm.lv_present state to accept a resizefs switch. So, when
+  the logical volume is resized, the filesystem will be resized too. (#55265)
+- Change the ``enable_fqdns_grains`` setting to default to ``False`` on proxy minions
+  as it is generally not needed and just slows down start up time.. (#57676)
+- Adds network teaming support to ``network.managed`` state for RHEL-based
+  distros. Removes ``ip.get_bond`` and ``ip.build_bond`` for the same, as is
+  redundant and not needed for any current RHEL/CentOS/Fedora/etc. release. (#57775)
+- The ``serializer`` argument has been added to the :py:func:`file.serialize
+  <salt.states.file.serialize>` state, as an alternative to ``formatter``. This
+  brings it more in line with the ``serializer_opts`` and ``deserializer_opts``
+  arguments. ``formatter`` is still supported, but using both ``serializer`` and
+  ``formatter`` will cause the state to fail. (#57858)
+
+
+Fixed
+-----
+
+- `file.read` exec module function no longer fails on binary data. (#58033)
+- Remove py2 support from winrepo execution module and runner (#58596)
+- Create ini file if does not exist when using ini.options_present state module. (#34236)
+- Added an bool "strict" argument to sdb.get module to force module to fail if the sdb uri is not correct. (#39163)
+- Fixed issue with postgres.has_privilege breaking on ALL. (#48465)
+- check for azurearm username in config before adding username and password to the virtual machine properties (#49063)
+- Fixes service.status to return True/False instead of empty strings or PIDs of the service. This brings macOS into parity with the other service modules. (#49237)
+- fix frequent rest_tornado non-fatal tracebacks (#49572)
+- Do not use reverse DNS of the target used in salt-ssh. Use the target the user provides. (#49840)
+- Fixes startup issue where it tried to load the kernalparams grain on Windows (#49901)
+- Fixed error in nilrt_ip.get_interfaces_details when loading config. (#50416)
+- Doesn't remove underscore when sanitizing hostname in network salt util (#50527)
+- permit the use of int/float type for the version in:
+   - the state postgres_cluster.present
+   - the state postgres_cluster.absent
+   - the module postgres.cluster_create
+   - the module postgres.cluster_remove (#50899)
+- Cleaned up a trackback in lvm.pv_present when the disk doesn't exist. (#52363)
+- Fixed UnboundLocalError when using win_network.connect (#53371)
+- Add accept_ra 2 option to modules.debian_ip (#54067)
+- salt.runner test mode support (#54382)
+- Fixed mkpart to allow the creation of a partition without filesystem (#54456)
+- Fixes bogus warning message when an empty list is used for an environment in a
+  topfile. This allows `[]` to be used as a placeholder in a topfile without
+  needing to comment everything out as a workaround. (#54882)
+- win_certutil state will no longer fail on non-English systems upon successful additions and deletions of a certificate. (#55024)
+- Fixed file.directory state always showing mode change for symlinks. (#55878)
+- check for a docker error that the swarm already exists when calling swarm.swarm_init on an existing docker swarm (#55949)
+- Fixing stalekey engine so it deletes the keys when they are a list. (#55977)
+- An invalid _schedule.conf configuration file is renamed to _schedule.confYAMLError.
+  This avoids disabling the minion and busy polling the CPU on Windows. (#56216, #58177)
+- Proper calculation of tpldir and related context parameters (#56410)
+- Make gpg.encrypt examples work (#56646)
+- Artifactory encoding of headers fixed for py3 (#56660)
+- Fixed handling of extents extended attribute in file.managed state. (#57189)
+- Remove buggy start parameter from virt.pool_running docstring (#57275)
+- Fixed saltcheck rendering of map.jinja files from saltenv (#57327)
+- Fix for `virt.get_profiles` resolves an error that appears due to new parameters introduced with `_disk_profile()` (#57431)
+- Accept nested namespaces in spacewalk.api runner function. (#57442)
+- virt.init fix the disk target names (#57477)
+- Fix volume name for disk-typed pools in virt.defined (#57497)
+- Fixes an issue with filesystems options ordering which kept already
+  applied NFS fstab entries being updated. (#57520)
+- Do not allow python2 to be added to salt-ssh tar since Salt deprecated Python 2. (#57647)
+- Fixed exception on loading custom zipped modules. (#57674)
+- corrected support for app_id or local vault configurations (#57705)
+- Fix the registration of libvirt pool and nodedev events (#57746)
+- Pass cmd.run state arguments to unless and onlyif when they exist (#57760)
+- The 2004 release of Windows 10 introduced a bug in the InstallationBehavior COM
+  object where you can no longer get properties from that object. Calls to this
+  object are now wrapped in a try/except block with sane defaults when it fails to
+  read attributes.
+
+  Additionally, some pre-flight checks have been added to the win_wua module to
+  make sure Windows Update can actually run. (#57762)
+- Changed get_repo in yumpkg.py to use "repo" as first parameter.
+  This fixes #57778, a bug were every run of pkgrepo.managed state were
+  marked as changed because the get_repo did fail to detect a previously
+  applied run. (#57778)
+- Raise SaltClientError in parse_host_port insted of ValueError so it is caught and handled properly when the minion is connecting to the master. (#57789)
+- Fixed issue with the return dictionary from the workgroup() function in the
+  salt.states.win_system module. This resulted in a windows-based minion logging
+  an error and could also interfere with a highstate being applied. (#57790)
+- Fixes broken block_device_mapping and block_device_mapping_v2 type checks in
+  the OpenStack cloud driver. Salt was looking for a dict and the shade library
+  was looking for a list of dicts. This made it impossible to use those params. (#57802)
+- Fixed incorrect parsing of ``Set-Cookie`` response headers. (#57829)
+- When using yumpkg, report stdout when stderr is redirected to stdout. (#57862)
+- Fixes an issue on macOS where if you try and restart the macOS using serivce.restart salt-minion it would fail because the service names are different on macOS. (#57878)
+- Fixes an issue on macOS where salt would take extra time to run on a service.dead call and the service is missing. (#57907)
+- Fixes an issue where a disabled macOS and Windows service would fail to start with service.running. (#57908)
+- Use "use_bin_type" to differentiate between bytes and str when writing cache
+  for pillar and grains. (#57918)
+- Set the comment to "No minions responded" if salt.function fails to find any
+  minions (#57920)
+- Fix issue with `__utils__` usage in the `__virtual__` functions on a few of the
+  execution modules. (#57948)
+- remove encoding kwarg for both pack(b)/unpack(b) in msgpack for versions >=1.0.0
+  https://github.com/msgpack/msgpack-python/blob/master/ChangeLog.rst#100 (#57965)
+- Replace deprecated `cgi.escape()` with `html.escape()` after it was removed from Python 3.8. (#57983)
+- Fix btrfs state decorator, that produces exceptions when creating subvolumes. (#58012)
+- Fix kubeadm token_list when the list of tokens is empty (#58116)
+- Add a fix for the mac_service modules where it would fail to load in some new services and crash on Big Sur. (#58143)
+- Fix blank tplfile context parameter when loading top level sls files (#58249)
+- Do not include init directory in sls context parameters if explicitly specified (#58250)
+- Fixing pillar caching when pillar environments are involved. (#58274)
+- Make proxy_config read in the proxy specific configuration which is typically found in /etc/salt/proxy.d/minionid/. (#58307)
+- Add timeout kwarg docs for service.running and service.dead (#58311)
+- Return empty dict on win_pdh.get_counters rather than raising exception when no data are available (#58327)
+- Leave boot parameters untouched if boot parameter is set to None in virt.update (#58331)
+- Convert disks of volume type to file or block disks on Xen (#58333)
+- Apparently Apple is using both "10.16" and "11" for versioning Big Sur,
+  depending on where you look. The mac_softwareupdate module uses a different
+  regex depending on OS version, and the determination was based on the
+  osrelease_info grain. This results in a Big Sur machine not using the correct
+  regex; osrelease_info[1] is 0 for Big Sur.
+
+  This change simply adds an additional clause to the if statement to handle
+  osmajorrelease > 10. (#58340)
+- Fixed zmq salt-call hang!
+
+  Some objects from the 3rd party module zmq fail to deconstruct if left to the GC when Python exits.
+  This is because the objects get destroyed out of order.
+  This only happens on some platforms like ubuntu 20.04 and some versions of FreeBSD.
+  We fixed this hang by deconstructing all zmq objects in the right order before we exit salt-call. (#58364)
+- Reactor runner functions will now ensure reactor system is available before attempting to run and error out if it is not available. (#58384)
+- Fix enpoint typos (#58416)
+- Make sure we repopulate ``__utils__`` on Windows when a job is run from the scheduler. (#58437)
+- Adding a check when a source is an HTTP or FTP URL to do a query to ensure the URL is valid before returning, then we know if we need to move onto to the next source in the list or not. (#58441)
+- Improved documentation for the LGPO state module (#58521)
+- Remove old documented pending reboot key (#58530)
+- On macOS, skip GUI dialog for Developer Command Line Tools when importing gitfs util. (#58575)
+- Fixing a use case when multiple inotify beacons are defined but when notifications are fired the configuration from the first beacon are used. (#58655)
+
+
+Added
+-----
+
+- Salt Api
+  ========
+
+  salt-api will now work on Windows platforms with limited support. You will be
+  able to configure the ``rest_cherrypy`` module, without ``pam`` external
+  authentication and without ssl support.
+
+  Example configuration:
+
+  .. code-block:: yaml
+      external_auth:
+        auto:
+          saltuser:
+            -.*
+      rest_cherrypy:
+        host: 127.0.0.1
+        port: 8000 (#49949)
+- Added `execution_timeout` support to `chocolatey.installed` state (#50449)
+- Add new verify_ssl option to file modules. This allows a user to not validate the server certificate for HTTPS source and source hash's. (#52663)
+- Added list target type support to the `scan` salt-ssh roster. (#52675)
+- Added pvresize and lvextend to linux_lvm (#56089)
+- Added COPR option to states.pkgrepo (#57258)
+- Add "get_return" key for onlyif and unless requisites to parse deep module results (#57470)
+- Allow setting VM boot devices order in virt.running and virt.defined states (#57544)
+- Added grains to show the LVM Volume Groups and their Logical Volumes. (#57629)
+- Memory Tuning Support which allows much greater control of memory allocation (#57639)
+- Add output filter to saltcheck to only display test failures (#57788)
+- ### Description
+  Add profile block and profiling of import_* jinja calls.
+
+  ### Example
+  ```sls
+  # cat /srv/salt/example.sls 
+  {%- profile as 'local data' %}
+    {%- set local_data = {'counter': 0} %}
+    {%- for i in range(313377) %}
+      {%- do local_data.update({'counter': i}) %}
+    {%- endfor %}
+  {%- endprofile %}
+
+  test:
+    cmd.run:
+      - name: |-
+          printf 'local data: %s' '{{ local_data['counter'] }}'
+  ```
+
+  ### Motivation
+
+  When working with a very large codebase, it becomes more important to trace
+  inefficiencies in state and pillar render times.  The `profile` jinja block
+  enables the user to get finely detailed information on the most time consuming
+  jinja expressions in the codebase.
+
+  Especially as the codebase grows and the amount of minions increases, tracking
+  down expensive expressions becomes imperative otherwise the resource burden for
+  even just maintaining highstate becomes unmanageable. (#57849)
+- - Added an execution module for running idem exec modules
+  - Added a state module for running idem states (#57969)
+- - Added the ability for states to return `sub_state_run`s -- results frome external state engines (#57993)
+- Added salt-cloud support for Linode APIv4 via the ``api_version`` provider configuration parameter. (#58093)
+- Added support to manage services in Slackware Linux. (#58206)
+- Added list_sources to chocolatey module to have an overview of the repositories present on the minions.  
+  Added source_added to chocolatey state in order to add repositories to chocolatey. (#58588)
+- Adding tests for changes to virtual function for netmiko module. Adding tests for netmiko proxy minion module. (#58609)
+- Added features config option for feature flags. Added a feature flag
+  `enable_slsvars_fixes` to enable fixes to tpldir, tplfile and sls_path.
+  This flag will be deprecated in the Phosphorus release when this functionality
+  becomes the default. (#58652)
+
 
 Salt 3001.1 (2020-07-27)
 ========================
@@ -64,6 +293,7 @@ Fixed
 - Fixed macOS build scripts. (#57973)
 - Fixed Salt-API startup failure. (#57975)
 - Fixed CSR handling in x509 module (#54867)
+- Re-allow x509 to manage a certificate based on a CSR
 
 
 Added
@@ -92,13 +322,14 @@ Removed
 - Deprecated `refresh_db` removed from pkgrepo state. Use `refresh` instead. (#57366)
 - Deprecated internal functions salt.utils.locales.sdecode and .sdecode_if_string removed. Use salt.utils.data.decode instead. (#57367)
 - Removed deprecated misc. internal Salt functions. See https://github.com/saltstack/salt/issues/57368 for more info. (#57368)
+- Remove salt/utils/vt.py duplication from filename map. (#57004)
 
 
 Changed
 -------
 
 - `file.rename` no longer returns False when `force:False`. (#49843)
-- Brought localclient command line args functionality into line with regular `salt` calls. (#49886)
+- Brought localclient command line args functionality into line with regular `salt` calls. (#56853)
 - Updated requisites documentation. (#49962)
 - Changed eauth "not enabled" log message level from debug to warning. (#50946)
 -  (#52546)
@@ -119,6 +350,7 @@ Changed
 - Upgraded dependency to use boto3>=1.13.5. (#57161)
 - Changed to consistent file location handling across APIs for Juniper network devices. (#57399)
 - Use Python's hashlib (sha256) instead of shelling out (SipHash24) to generate server_id. (#57415)
+- Update `formulas.rst` with new IRC channel and links to IRC logs (#51628)
 
 
 Fixed
@@ -145,10 +377,10 @@ Fixed
 - Fixed to use the correct LetsEncrypt path on FreeBSD. (#49129)
 - Updated docs for netapi logs - log.access_file and log.error_file. (#49247)
 - Retry proxmox queries instead of failing immediately. (#49485)
-- Fixed AMD GPU vendor detection. (#49492)
+- Fixed AMD GPU vendor detection. (#56837)
 - Fixed `aptpkg.normalize_name` to respect architecture. (#49637)
 - Add error message for proxmox failures. (#49562)
-- Fixed nilrt_ip.enable/disable idempotency. (#49624)
+- Fixed nilrt_ip.enable/disable idempotency. (#56795)
 - Fixed issue with file.line doing a partial comparison to determine replacement need, instead compare actual content of lines. (#49855)
 - Return actual error message to user or hex code for `win_task.create_task_from_xml`. (#49981)
 - Use minion name as ssh_host for saltify cloud provider. (#50135)
@@ -199,6 +431,7 @@ Fixed
 - Fixed error when trying to delete more than one key using `ini.options_absent`. (#53874)
 - Fixed error with cmd.run when run in a chroot environment. (#53992)
 - Fixed Zabbix configuration.import to use the correct values for the API version. (#54020)
+- Fixed salt key management with eauth. (#54078)
 - Fixed broken sdb.get_or_set_hash when using Hashicorp's Vault. (#54199)
 - Fixed `mac_softwareupdate.list_available` for Catalina. (#54220)
 - Fixed bug blocking `user.present` `createhome` on macOS. (#54288)
@@ -286,6 +519,7 @@ Fixed
 - Fixed issue with `salt.utils.functools.call_functions` not checking for expected arguments. (#56584)
 - Fixed a broken statement when using arbitrary `kwargs` in mine.value. (#56593)
 - Fixed support for booting VMs with UEFI on virt. (#56613)
+- Fixed postgres.db_remove() execution function if db is still in use. (#56631)
 - Updated old redirects and http->https fixes in docs. (#56655)
 - Renamed `salt/utils/docker/` to `salt/utils/dockermod/` to avoid clashes with the `docker` package from pypi. (#56669)
 - Changed behavior to implicitly ignore package epochs and just use the latest one. (#56681)
@@ -327,6 +561,9 @@ Fixed
 - Fixed `win_system.join_domain` failures. (#57360)
 - Fixed `template_vars` functionality on Junos. (#57388)
 - Filter out aliases/duplicates from zypperpkg for <=SLE12SP4. (#57392)
+- Fix issue with finding the real python executable during tests (#56686)
+- Fix broken link regarding the 1024 character limit for YAML keys (#56540)
+- Fix grain.delkey grains.delval for nested keys (#54819)
 
 
 Added
@@ -350,7 +587,7 @@ Added
 - Added ability to disable requisites during state runs. (#49955)
 - Add a reactor "leader", especially useful for multimaster hot-hot environments. (#50053)
 - Added `method_call` Jinja filter to help reduce boilerplate. (#50152)
-- Added ability for async pillar refresh. (#50168)
+- Added ability for async pillar refresh. (#56881)
 - Added `shutdown_host` to vmware cloud. (#50177)
 - Added `drbd.status` module. (#50410)
 - Added `file.keyvalue` state. (#50627)
@@ -424,6 +661,7 @@ Added
 - `fetchonly` parameter added for `pkg.upgrade` when using `pkgng` (FreeBSD). (#57371)
 - Added `efi` parameter to virt module, so `uefi` firmware can be auto selected. (#57397)
 - [#56637](https://github.com/saltstack/salt/pull/56637) - Add ``win_wua.installed`` to the ``win_wua`` execution module
+- Clarify how to get the master fingerprint (#54699)
 
 
 ## 3000.1

CODE_OF_CONDUCT.md

@@ -2,73 +2,127 @@
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at conduct@saltstack.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
+reported to the community leaders responsible for enforcement at
+conduct@saltstack.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

Gemfile

@@ -19,7 +19,7 @@ group :windows do
 end
 
 group :ec2 do
-  gem 'kitchen-ec2'
+  gem 'kitchen-ec2', '>=3.8'
 end
 
 group :vagrant do

LICENSE

@@ -342,7 +342,7 @@ License: Apache-2.0
  .
  Files in this directory were created in-house.
 
-Files: tests/utils/cptestcase.py
+Files: tests/support/cptestcase.py
 Copyright: (c) 2014 Adam Hajari
 The MIT License (MIT)
 

MANIFEST.in

@@ -17,7 +17,6 @@ recursive-include scripts *
 recursive-include conf *
 recursive-include pkg *
 recursive-include salt *.jinja
-recursive-include salt *.flo
 recursive-include templates *
 include salt/templates/git/*
 include salt/templates/lxc/*

Pipfile

@@ -1,41 +0,0 @@
-[[source]]
-url = "https://pypi.org/simple"
-verify_ssl = true
-name = "pypi"
-
-[packages]
-Jinja2 = "*"
-msgpack-python = ">0.3,!=0.5.5"
-PyYAML = "*"
-MarkupSafe = "*"
-requests = ">=1.0.0"
-tornado = ">=4.2.1,<5.0"
-pycrypto = ">=2.6.1"
-pyzmq = ">=2.2.0"
-
-[dev-packages]
-mock = ">=2.0.0"
-apache-libcloud = ">=0.14.0"
-boto = ">=2.32.1"
-boto3 = ">=1.2.1"
-moto = ">=0.3.6"
-SaltPyLint = ">=v2017.3.6"
-pytest = ">=4.0.1"
-pytest-cov = "*"
-pytest-salt = "==2018.12.8"
-pytest-timeout = ">=1.3.3"
-pytest-tempdir = ">=2018.8.11"
-pytest-helpers-namespace = ">=2017.11.11"
-
-[packages.futures]
-# Required by Tornado to handle threads stuff.
-version = ">=2.0"
-markers = "python_version < '3.0'"
-
-[dev-packages.httpretty]
-# httpretty Needs to be here for now even though it's a dependency of boto.
-# A pip install on a fresh system will decide to target httpretty 0.8.10 to
-# satisfy other requirements, and httpretty 0.8.10 has bugs in setup.py that
-# prevent it from being successfully installed (at least on Python 3.4).
-version = "*"
-markers = "python_version >= '3.4'"

README.rst

@@ -1,89 +1,174 @@
-==================
-What is SaltStack?
-==================
-
-SaltStack makes software for complex systems management at scale.
-SaltStack is the company that created and maintains the Salt Open
-project and develops and sells SaltStack Enterprise software, services
-and support. Easy enough to get running in minutes, scalable enough to
-manage tens of thousands of servers, and fast enough to communicate with
-them in *seconds*.
-
-Salt is a new approach to infrastructure management built on a dynamic
-communication bus. Salt can be used for data-driven orchestration,
-remote execution for any infrastructure, configuration management for
-any app stack, and much more.
-
-Download Salt Open
-==================
-
-Salt Open is tested and packaged to run on CentOS, Debian, RHEL, Ubuntu,
-Windows. Download Salt Open and get started now.
-
-`<https://repo.saltstack.com/>`_
-
-`Installation Instructions <https://docs.saltstack.com/en/latest/topics/installation/index.html>`_
+.. raw:: html
+
+    <p align="center">
+        <a href="https://github.com/saltstack/salt/blob/master/LICENSE" alt="License Apache 2.0">
+            <img src="https://img.shields.io/github/license/saltstack/salt" /></a>
+        <a href="https://pypi.org/project/salt">
+            <img src="https://img.shields.io/pypi/dm/salt?label=pypi%20downloads"
+                alt="commits since last release"></a>
+        <a href="https://coveralls.io/github/saltstack/salt">
+            <img src="https://img.shields.io/coveralls/github/saltstack/salt"
+                alt="coverage"></a>
+        <a href="https://lgtm.com/projects/g/saltstack/salt/context:python">
+            <img src="https://img.shields.io/lgtm/grade/python/github/saltstack/salt"
+                alt="Code quality: python"/></a>
+        </br>
+        <a href="https://saltstackcommunity.herokuapp.com/">
+            <img src="https://img.shields.io/badge/slack-@saltstackcommunity-blue.svg?logo=slack"
+                alt="chat on Slack"></a>
+        <a href="https://www.twitch.tv/saltstackinc">
+            <img src="https://img.shields.io/twitch/status/saltstackinc"
+                alt="Watch on Twitch"></a>
+        <a href="https://www.reddit.com/r/saltstack/">
+            <img src="https://img.shields.io/reddit/subreddit-subscribers/saltstack?style=social"
+                alt="chat on reddit"></a>
+        <a href="https://twitter.com/intent/follow?screen_name=saltstack">
+            <img src="https://img.shields.io/twitter/follow/saltstack?style=social&logo=twitter"
+                alt="follow on Twitter"></a>
+    </p>
+
+    <!-- PROJECT LOGO -->
+    <br />
+    <p align="center">
+    <a href="https://saltstack.com">
+        <img src="doc/_static/salt-oss-logo.png" alt="Salt Logo" width="300">
+    </a>
+    <p align="center">
+        <a href="https://repo.saltstack.com/">
+            <img src="https://img.shields.io/github/v/release/saltstack/salt"
+                alt="Latest release version"></a>
+        </br>
+        <b>Salt</b> is the world’s fastest, most intelligent and scalable automation engine.
+        <br />
+        <a href="https://docs.saltstack.com/en/latest/"><strong>Explore the docs »</strong></a>
+        <br />
+        <a href="https://www.saltstack.com/try-salt-open/">Demo Salt For Free Online</a>
+        ·
+        <a href="https://github.com/saltstack/salt/issues/new?assignees=&labels=Bug&template=bug_report.md&title=%5BBUG%5D">Report Bug</a>
+        ·
+        <a href="https://github.com/saltstack/salt/issues/new?assignees=&labels=Feature&template=feature_request.md&title=%5BFEATURE+REQUEST%5D">Request Feature</a>
+    </p>
+    </p>
+
+
+About Salt
+==========
+
+Built on python, Salt uses simple and human-readable YAML combined with
+event-driven automation to deploy and configure complex IT systems. In addition
+to powering SaltStack’s powerful enterprise product suite, Salt can be found
+under the hood of products from Juniper, Cisco, Cloudflare, Nutanix, SUSE, and
+Tieto, to name a few.
+
+About SaltStack
+===============
+
+SaltStack develops award-winning software used by IT and security operations
+teams to help modern business more efficiently secure and maintain all aspects
+of their digital infrastructure. But we’re not like other legacy systems
+management or security software tools. Our software is unique in providing
+intelligent, event-driven automation for efficient control of complex business
+systems at any scale.
+
+We help enterprise IT organizations orchestrate and automate difficult IT tasks
+with speed and flexibility to ultimately deliver continuous security compliance,
+vulnerability remediation, and real IT security.
+
+Whether you need help automating the work of ITOps, DevOps, NetOps, or SecOps
+functions, SaltStack software is the answer. In addition to open source
+software, such as Salt, we offer
+`SaltStack Enterprise <https://www.saltstack.com/products/saltstack-enterprise/>`_
+and
+`SaltStack SecOps <https://www.saltstack.com/products/secops/>`_ products to
+manage and secure your digital business operations.
+
+Download Salt
+=============
+
+Salt is tested and packaged to run on CentOS, Debian, RHEL, Ubuntu,
+Windows. Download Salt and get started now.
+
+* `<https://repo.saltstack.com/>`_
+* `Installation Instructions <https://docs.saltstack.com/en/latest/topics/installation/index.html>`_
 
 SaltStack Documentation
 =======================
 
-Installation instructions, getting started guides, and in-depth API
-documentation.
-
-`<https://docs.saltstack.com/en/getstarted/>`_
-
-`<https://docs.saltstack.com/en/latest/>`_
-
-Security Advisory
-=================
-
-For historical reasons, Salt requires PyCrypto as a "lowest common
-denominator". However, `PyCrypto is unmaintained`_ and best practice is to
-manually upgrade to use a more maintained library such as `PyCryptodome`_. See
-`Issue #52674`_ and `Issue #54115`_ for more info
-
-Engage SaltStack
-================
-
-`SaltConf`_, **User Groups and Meetups** - SaltStack has a vibrant and `global
-community`_ of customers, users, developers and enthusiasts. Connect with other
-Salted folks in your area of the world, or join `SaltConf`_, the SaltStack
-annual user conference held in Salt Lake City. Please visit the `SaltConf`_ site
-for details of our next conference. Also, please let us know if you would like
-to start a user group or if we should add your existing SaltStack user group to
-this list by emailing: info@saltstack.com
-
-**SaltStack Training** - Get access to proprietary `SaltStack education
-offerings`_ through instructor-led training offered on-site, virtually or at
-SaltStack headquarters in Salt Lake City. SaltStack Enterprise training helps
-increase the value and effectiveness of SaltStack software for any customer and
-is a prerequisite for coveted `SaltStack Certified Engineer (SSCE)`_ status.
-SaltStack training is also available through several `SaltStack professional
-services`_ offerings.
-
-**Follow SaltStack on -**
-
-* YouTube - `<http://www.youtube.com/saltstack>`_
-* Twitter - `<http://www.twitter.com/saltstack>`_
-* Facebook - `<https://www.facebook.com/SaltStack/>`_
-* LinkedIn - `<https://www.linkedin.com/company/salt-stack-inc>`_
-* LinkedIn Group - `<https://www.linkedin.com/groups/4877160>`_
-
-.. _global community: http://www.meetup.com/pro/saltstack/
-.. _SaltConf: http://saltconf.com/
-.. _SaltStack education offerings: http://saltstack.com/training/
-.. _SaltStack Certified Engineer (SSCE): http://saltstack.com/certification/
-.. _SaltStack professional services: http://saltstack.com/services/
-.. _PyCrypto is unmaintained: https://github.com/dlitz/pycrypto/issues/301#issue-551975699
-.. _PyCryptodome: https://pypi.org/project/pycryptodome/
-.. _Issue #52674: https://github.com/saltstack/salt/issues/52674
-.. _Issue #54115: https://github.com/saltstack/salt/issues/54115
+Installation instructions, getting started guides, in-depth API
+documentation, and contributing to Salt.
+
+* `Getting Started with Salt <https://docs.saltstack.com/en/getstarted/>`_
+* `Latest Salt Documentation <https://docs.saltstack.com/en/latest/>`_
+* `Salt’s Contributor Guide <https://docs.saltstack.com/en/latest/topics/development/contributing.html>`_
+
+Security Advisories
+===================
+
+In 2020, SaltStack created a
+`**Security Announcements** <https://www.saltstack.com/security-announcements/>`_
+landing page. SaltStack recommends subscribing to the
+`SaltStack Security RSS feed <http://www.saltstack.com/feed/?post_type=security>`_
+to receive notification when new information is available regarding security
+announcements.
+
+Other channels to receive security announcements include the
+`Salt Community mailing list <https://groups.google.com/forum/#!forum/salt-users>`_
+and the
+`Salt Community Slack Channel <https://saltstackcommunity.herokuapp.com/>`_.
+
+Responsibly Reporting Security Vulnerabilities
+++++++++++++++++++++++++++++++++++++++++++++++
+
+When reporting security vulnerabilities for Salt or other SaltStack projects,
+refer to the
+`SECURITY.md <https://github.com/saltstack/salt/blob/master/SECURITY.md>`_ file
+found in this repository.
+
+Engage SaltStack and The Community
+==================================
+
+Please be sure to review our
+`Code of Conduct <https://github.com/saltstack/salt/blob/master/CODE_OF_CONDUCT.md>`_.
+Also, check out some of our community resources including:
+
+* `SaltStack Community Wiki <https://github.com/saltstack/community/wiki>`_
+* `SaltStack Community Slack <https://saltstackcommunity.herokuapp.com/>`_
+* `SaltStack: IRC on Freenode <https://webchat.freenode.net/#salt>`_
+* `SaltStack YouTube channel <https://www.youtube.com/user/SaltStack>`_
+* `SaltStackInc Twitch channel <https://www.twitch.tv/saltstackinc>`_
+
+There are lots of ways to get involved in our community. Every month, there are
+around a dozen opportunities to meet with other contributors and the Salt Core
+team and collaborate in real time. The best way to keep track is by subscribing
+to the 
+`Salt Community Events Calendar <https://calendar.google.com/calendar/embed?src=saltstack.com_md73c3ufcs2eqbsmmnike4em80%40group.calendar.google.com&ctz=America%2FNew_York>`_.
+If you have additional questions, email us at core@saltstack.com or reach out
+directly to the Community Manager, Cassandra Faris via Slack. We’d be glad to
+have you join our community!
+
+SaltStack Training
+++++++++++++++++++
+
+Get access to proprietary
+`SaltStack education offerings <https://www.saltstack.com/products/saltstack-training/>`_
+through instructor-led training offered on-site, virtually or at SaltStack
+headquarters in Salt Lake City. SaltStack Enterprise training helps increase the
+value and effectiveness of SaltStack software for any customer and is a
+prerequisite for coveted **SaltStack Certified Administrator (SSCA)** and 
+**SaltStack Certified Engineer (SSCE)** certifications.
+
+SaltStack training is also available through several
+`SaltStack professional services <https://www.saltstack.com/products/saltstack-services/>`_
+offerings.
 
 License
 =======
 
-SaltStack is licensed by the SaltStack Team under the Apache 2.0 license. Please see the
-LICENSE file for the full text of the Apache license, followed by a full summary
-of the licensing used by external modules.
+SaltStack is licensed by the SaltStack Team under the Apache 2.0 license. Please
+see the
+`LICENSE file <https://github.com/saltstack/salt/blob/master/LICENSE>`_ for the
+full text of the Apache license, followed by a full summary of the licensing
+used by external modules.
 
-A complete list of attributions and dependencies can be found here: https://github.com/saltstack/salt/blob/master/DEPENDENCIES.md
+A complete list of attributions and dependencies can be found here:
+`salt/DEPENDENCIES.md <https://github.com/saltstack/salt/blob/master/DEPENDENCIES.md>`_

SECURITY.md

@@ -0,0 +1,120 @@
+# SaltStack's Security Disclosure Policy
+
+**Email**
+- security@saltstack.com
+
+**GPG key ID:**
+- 4EA0793D
+
+**GPG key fingerprint:**
+- `8ABE 4EFC F0F4 B24B FF2A  AF90 D570 F2D3 4EA0 793D`
+
+**GPG Public Key**
+
+```
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+vtBIWO4LPeGEvb2Gs65PL2eouOqU6yvBr5Y=
+=F/97
+-----END PGP PUBLIC KEY BLOCK-----
+```
+
+The SaltStack Security Team is available at security@saltstack.com for
+security-related bug reports or questions.
+
+We request the disclosure of any security-related bugs or issues be reported
+non-publicly until such time as the issue can be resolved and a security-fix
+release can be prepared. At that time we will release the fix and make a public
+announcement with upgrade instructions and download locations.
+
+## Security response procedure
+
+SaltStack takes security and the trust of our customers and users very
+seriously. Our disclosure policy is intended to resolve security issues as
+quickly and safely as is possible.
+
+1.  A security report sent to security@saltstack.com is assigned to a team
+    member. This person is the primary contact for questions and will
+    coordinate the fix, release, and announcement.
+
+2.  The reported issue is reproduced and confirmed. A list of affected projects
+    and releases is made.
+
+3.  Fixes are implemented for all affected projects and releases that are
+    actively supported. Back-ports of the fix are made to any old releases that
+    are actively supported.
+
+4.  Packagers are notified via the [salt-packagers](https://groups.google.com/forum/#!forum/salt-packagers) mailing list that an issue
+    was reported and resolved, and that an announcement is incoming.
+
+5.  A new release is created and pushed to all affected repositories. The
+    release documentation provides a full description of the issue, plus any
+    upgrade instructions or other relevant details.
+
+6.  An announcement is made to the [salt-users](https://groups.google.com/forum/#!forum/salt-users) and [salt-announce](https://groups.google.com/forum/#!forum/salt-announce) mailing
+    lists. The announcement contains a description of the issue and a link to
+    the full release documentation and download locations.
+
+## Receiving security announcements
+
+The fastest place to receive security announcements is via the [salt-announce](https://groups.google.com/forum/#!forum/salt-announce)
+mailing list. This list is low-traffic.

changelog/49063.fixed

@@ -1 +0,0 @@
-check for azurearm username in config before adding username and password to the virtual machine properties

changelog/49237.fixed

@@ -1 +0,0 @@
-Fixes service.status to return True/False instead of empty strings or PIDs of the service. This brings macOS into parity with the other service modules.

changelog/49840.fixed

@@ -1 +0,0 @@
-Do not use reverse DNS of the target used in salt-ssh. Use the target the user provides.

changelog/49949.added

@@ -1,17 +0,0 @@
-Salt Api
-========
-
-salt-api will now work on Windows platforms with limited support. You will be
-able to configure the ``rest_cherrypy`` module, without ``pam`` external
-authentication and without ssl support.
-
-Example configuration:
-
-.. code-block:: yaml
-    external_auth:
-      auto:
-        saltuser:
-          -.*
-    rest_cherrypy:
-      host: 127.0.0.1
-      port: 8000

changelog/50449.added

@@ -1 +0,0 @@
-Added `execution_timeout` support to `chocolatey.installed` state

changelog/52363.fixed

@@ -1 +0,0 @@
-Cleaned up a trackback in lvm.pv_present when the disk doesn't exist.

changelog/54067.fixed

@@ -1 +0,0 @@
-Add accept_ra 2 option to modules.debian_ip

changelog/55024.fixed

@@ -1 +0,0 @@
-win_certutil state will no longer fail on non-English systems upon successful additions and deletions of a certificate.

changelog/55265.changed

@@ -1,2 +0,0 @@
-Changed the lvm.lv_present state to accept a resizefs switch. So, when
-the logical volume is resized, the filesystem will be resized too.

changelog/55878.fixed

@@ -1 +0,0 @@
-Fixed file.directory state always showing mode change for symlinks.

changelog/56089.added

@@ -1 +0,0 @@
-Added pvresize and lvextend to linux_lvm

changelog/56660.fixed

@@ -1 +0,0 @@
-Artifactory encoding of headers fixed for py3

changelog/57275.fixed

@@ -1 +0,0 @@
-Remove buggy start parameter from virt.pool_running docstring

changelog/57431.fixed

@@ -1 +0,0 @@
-Fix for `virt.get_profiles` resolves an error that appears due to new parameters introduced with `_disk_profile()`

changelog/57477.fixed

@@ -1 +0,0 @@
-virt.init fix the disk target names

changelog/57497.fixed

@@ -1 +0,0 @@
-Fix volume name for disk-typed pools in virt.defined

changelog/57544.added

@@ -1 +0,0 @@
-Allow setting VM boot devices order in virt.running and virt.defined states

changelog/57629.added

@@ -1 +0,0 @@
-Added grains to show the LVM Volume Groups and their Logical Volumes.

changelog/57676.changed

@@ -1,2 +0,0 @@
-Change the ``enable_fqdns_grains`` setting to default to ``False`` on proxy minions
-as it is generally not needed and just slows down start up time..

changelog/57746.fixed

@@ -1 +0,0 @@
-Fix the registration of libvirt pool and nodedev events

changelog/57775.changed

@@ -1,3 +0,0 @@
-Adds network teaming support to ``network.managed`` state for RHEL-based
-distros. Removes ``ip.get_bond`` and ``ip.build_bond`` for the same, as is
-redundant and not needed for any current RHEL/CentOS/Fedora/etc. release.

changelog/57802.fixed

@@ -1,3 +0,0 @@
-Fixes broken block_device_mapping and block_device_mapping_v2 type checks in
-the OpenStack cloud driver. Salt was looking for a dict and the shade library
-was looking for a list of dicts. This made it impossible to use those params.

changelog/57858.changed

@@ -1,5 +0,0 @@
-The ``serializer`` argument has been added to the :py:func:`file.serialize
-<salt.states.file.serialize>` state, as an alternative to ``formatter``. This
-brings it more in line with the ``serializer_opts`` and ``deserializer_opts``
-arguments. ``formatter`` is still supported, but using both ``serializer`` and
-``formatter`` will cause the state to fail.

changelog/57907.fixed

@@ -1 +0,0 @@
-Fixes an issue on macOS where salt would take extra time to run on a service.dead call and the service is missing.

changelog/57908.fixed

@@ -1 +0,0 @@
-Fixes an issue where a disabled macOS and Windows service would fail to start with service.running.

changelog/57947.deprecated

@@ -1 +0,0 @@
-The `ssh` parameter of `virt.migrate` has been deprecated. Use a libvirt URI `target` value instead. Both `virt.migrate_non_shared` and `virt.migrate_non_shared_inc` have been deprecated. Use the `copy_storage` parameter with `virt.migrate` instead.

changelog/57965.fixed

@@ -1,2 +0,0 @@
-remove encoding kwarg for both pack(b)/unpack(b) in msgpack for versions >=1.0.0
-https://github.com/msgpack/msgpack-python/blob/master/ChangeLog.rst#100

changelog/57969.added

@@ -1,2 +0,0 @@
-- Added an execution module for running idem exec modules
-- Added a state module for running idem states

changelog/57983.fixed

@@ -1 +0,0 @@
-Replace deprecated `cgi.escape()` with `html.escape()` after it was removed from Python 3.8.

changelog/58331.fixed

@@ -1 +0,0 @@
-Leave boot parameters untouched if boot parameter is set to None in virt.update

changelog/58439.fixed

@@ -0,0 +1 @@
+When using ssh_pre_flight if there is a failure, fail on retcode not stderr.

changelog/58753.fixed

@@ -0,0 +1 @@
+Removing use of undefined varilable in utils/slack.py.

changelog/58773.fixed

@@ -0,0 +1 @@
+Ensuring that the version check function is run a second time in all the user related functions incase the user being managed is the connection user and the password has been updated.

cicd/jenkins/docs

@@ -1,4 +1,4 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runDocs(
     env: env)

cicd/jenkins/kitchen-amazon2-py3

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-05014360ac01845d0',
+    ami_image_id: 'ami-099d7623ded3199ea',
     concurrent_builds: 1,
     distro_name: 'amazon',
     distro_version: '2',

cicd/jenkins/kitchen-amazon2-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-05014360ac01845d0',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-099d7623ded3199ea',
+    concurrent_builds: 1,
     distro_name: 'amazon',
     distro_version: '2',
     env: env,

cicd/jenkins/kitchen-archlts-py3

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-074d73d377bbc9002',
+    ami_image_id: 'ami-09a38a1d2d9fa3201',
     concurrent_builds: 1,
     distro_name: 'arch',
     distro_version: 'lts',

cicd/jenkins/kitchen-archlts-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-074d73d377bbc9002',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-09a38a1d2d9fa3201',
+    concurrent_builds: 1,
     distro_name: 'arch',
     distro_version: 'lts',
     env: env,

cicd/jenkins/kitchen-centos7-py3

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-018072d7ecddbe0b7',
+    ami_image_id: 'ami-05764f27cdf8f99e0',
     concurrent_builds: 1,
     distro_name: 'centos',
     distro_version: '7',

cicd/jenkins/kitchen-centos7-py3-cloud

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-018072d7ecddbe0b7',
+    ami_image_id: 'ami-05764f27cdf8f99e0',
     concurrent_builds: 0,
     distro_name: 'centos',
     distro_version: '7',

cicd/jenkins/kitchen-centos7-py3-cloud-pytest

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-018072d7ecddbe0b7',
+    ami_image_id: 'ami-05764f27cdf8f99e0',
     concurrent_builds: 0,  // Don't cancel builds still running. Wait until they end.
     distro_name: 'centos',
     distro_version: '7',

cicd/jenkins/kitchen-centos7-py3-m2crypto

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-018072d7ecddbe0b7',
+    ami_image_id: 'ami-05764f27cdf8f99e0',
     concurrent_builds: 1,
     distro_name: 'centos',
     distro_version: '7',

cicd/jenkins/kitchen-centos7-py3-m2crypto-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-018072d7ecddbe0b7',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-05764f27cdf8f99e0',
+    concurrent_builds: 1,
     distro_name: 'centos',
     distro_version: '7',
     env: env,

cicd/jenkins/kitchen-centos7-py3-pycryptodome

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-018072d7ecddbe0b7',
+    ami_image_id: 'ami-05764f27cdf8f99e0',
     concurrent_builds: 1,
     distro_name: 'centos',
     distro_version: '7',

cicd/jenkins/kitchen-centos7-py3-pycryptodome-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-018072d7ecddbe0b7',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-05764f27cdf8f99e0',
+    concurrent_builds: 1,
     distro_name: 'centos',
     distro_version: '7',
     env: env,

cicd/jenkins/kitchen-centos7-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-018072d7ecddbe0b7',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-05764f27cdf8f99e0',
+    concurrent_builds: 1,
     distro_name: 'centos',
     distro_version: '7',
     env: env,

cicd/jenkins/kitchen-centos7-py3-tcp

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-018072d7ecddbe0b7',
+    ami_image_id: 'ami-05764f27cdf8f99e0',
     concurrent_builds: 1,
     distro_name: 'centos',
     distro_version: '7',

cicd/jenkins/kitchen-centos7-py3-tcp-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-018072d7ecddbe0b7',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-05764f27cdf8f99e0',
+    concurrent_builds: 1,
     distro_name: 'centos',
     distro_version: '7',
     env: env,

cicd/jenkins/kitchen-centos8-py3

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0889b02402d364a73',
+    ami_image_id: 'ami-0d482e88fbf35072c',
     concurrent_builds: 1,
     distro_name: 'centos',
     distro_version: '8',

cicd/jenkins/kitchen-centos8-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0889b02402d364a73',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-0d482e88fbf35072c',
+    concurrent_builds: 1,
     distro_name: 'centos',
     distro_version: '8',
     env: env,

cicd/jenkins/kitchen-debian10-py3

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0d3dd05e5f7163955',
+    ami_image_id: 'ami-0eb32b3297dc438d0',
     concurrent_builds: 1,
     distro_name: 'debian',
     distro_version: '10',

cicd/jenkins/kitchen-debian10-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0d3dd05e5f7163955',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-0eb32b3297dc438d0',
+    concurrent_builds: 1,
     distro_name: 'debian',
     distro_version: '10',
     env: env,

cicd/jenkins/kitchen-debian9-py3

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0b5017d617cf6a296',
+    ami_image_id: 'ami-033ed8f0f55cad1e0',
     concurrent_builds: 1,
     distro_name: 'debian',
     distro_version: '9',

cicd/jenkins/kitchen-debian9-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0b5017d617cf6a296',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-033ed8f0f55cad1e0',
+    concurrent_builds: 1,
     distro_name: 'debian',
     distro_version: '9',
     env: env,

cicd/jenkins/kitchen-fedora31-py3

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0a2d674be73e690bc',
+    ami_image_id: 'ami-014e0bc5fd36130a6',
     concurrent_builds: 1,
     distro_name: 'fedora',
     distro_version: '31',

cicd/jenkins/kitchen-fedora31-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0a2d674be73e690bc',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-014e0bc5fd36130a6',
+    concurrent_builds: 1,
     distro_name: 'fedora',
     distro_version: '31',
     env: env,

cicd/jenkins/kitchen-fedora32-py3

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0a474f3164afbb53b',
+    ami_image_id: 'ami-092f9c304a1403a02',
     concurrent_builds: 1,
     distro_name: 'fedora',
     distro_version: '32',

cicd/jenkins/kitchen-fedora32-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0a474f3164afbb53b',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-092f9c304a1403a02',
+    concurrent_builds: 1,
     distro_name: 'fedora',
     distro_version: '32',
     env: env,

cicd/jenkins/kitchen-freebsd121-py3

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0df0dc774d411107d',
+    ami_image_id: 'ami-07e12cf8c3e2dc24d',
     concurrent_builds: 1,
     distro_name: 'freebsd',
     distro_version: '121',

cicd/jenkins/kitchen-freebsd121-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0df0dc774d411107d',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-07e12cf8c3e2dc24d',
+    concurrent_builds: 1,
     distro_name: 'freebsd',
     distro_version: '121',
     env: env,

cicd/jenkins/kitchen-centos7-py3-proxy → cicd/jenkins/kitchen-freebsd122-py3

@@ -1,20 +1,17 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-018072d7ecddbe0b7',
+    ami_image_id: 'ami-0f8692a4a769c17e4',
     concurrent_builds: 1,
-    distro_name: 'centos',
-    distro_version: '7',
+    distro_name: 'freebsd',
+    distro_version: '122',
     env: env,
-    extra_codecov_flags: ["proxy"],
     golden_images_branch: 'master',
     jenkins_slave_label: 'kitchen-slave',
     nox_env_name: 'runtests-zeromq',
-    nox_passthrough_opts: '--proxy',
+    nox_passthrough_opts: '--ssh-tests',
     python_version: 'py3',
     testrun_timeout: 6,
-    force_run_full: true,
-    disable_from_filenames: true,
     use_spot_instances: true)
 
 // vim: ft=groovy

cicd/jenkins/kitchen-freebsd122-py3-pytest

@@ -0,0 +1,20 @@
+@Library('salt@master-1.9') _
+
+runTestSuite(
+    ami_image_id: 'ami-0f8692a4a769c17e4',
+    concurrent_builds: 1,
+    distro_name: 'freebsd',
+    distro_version: '122',
+    env: env,
+    golden_images_branch: 'master',
+    jenkins_slave_label: 'kitchen-slave',
+    nox_env_name: 'pytest-zeromq',
+    nox_passthrough_opts: '--ssh-tests',
+    python_version: 'py3',
+    //splits: ['unit', 'integration', 'multimaster'],
+    testrun_timeout: 6,
+    use_spot_instances: true,
+    //fast_slow_staged_testrun: true
+)
+
+// vim: ft=groovy

cicd/jenkins/kitchen-macosxcatalina-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 // Pre-nox pipeline
 runTestSuite(

cicd/jenkins/kitchen-macosxcatalina-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 // Pre-nox pipeline
 runTestSuite(
-    concurrent_builds: 2,
+    concurrent_builds: 1,
     distro_name: 'macosx',
     distro_version: 'catalina',
     env: env,

cicd/jenkins/kitchen-macosxhighsierra-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 // Pre-nox pipeline
 runTestSuite(

cicd/jenkins/kitchen-macosxhighsierra-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 // Pre-nox pipeline
 runTestSuite(
-    concurrent_builds: 2,
+    concurrent_builds: 1,
     distro_name: 'macosx',
     distro_version: 'highsierra',
     env: env,

cicd/jenkins/kitchen-macosxmojave-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 // Pre-nox pipeline
 runTestSuite(

cicd/jenkins/kitchen-macosxmojave-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 // Pre-nox pipeline
 runTestSuite(
-    concurrent_builds: 2,
+    concurrent_builds: 1,
     distro_name: 'macosx',
     distro_version: 'mojave',
     env: env,

cicd/jenkins/kitchen-opensuse15-py3

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-06cc7becf05c5f01f',
+    ami_image_id: 'ami-01f083bce987e56ce',
     concurrent_builds: 1,
     distro_name: 'opensuse',
     distro_version: '15',

cicd/jenkins/kitchen-opensuse15-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-06cc7becf05c5f01f',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-01f083bce987e56ce',
+    concurrent_builds: 1,
     distro_name: 'opensuse',
     distro_version: '15',
     env: env,

cicd/jenkins/kitchen-ubuntu1604-py3

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0271016d2ae2ec10f',
+    ami_image_id: 'ami-095abce041f0323d2',
     concurrent_builds: 1,
     distro_name: 'ubuntu',
     distro_version: '1604',

cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0271016d2ae2ec10f',
+    ami_image_id: 'ami-095abce041f0323d2',
     concurrent_builds: 1,
     distro_name: 'ubuntu',
     distro_version: '1604',

cicd/jenkins/kitchen-ubuntu1604-py3-m2crypto-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0271016d2ae2ec10f',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-095abce041f0323d2',
+    concurrent_builds: 1,
     distro_name: 'ubuntu',
     distro_version: '1604',
     env: env,

cicd/jenkins/kitchen-ubuntu1604-py3-proxy

@@ -1,20 +0,0 @@
-@Library('salt@master-1.7') _
-
-runTestSuite(
-    ami_image_id: 'ami-0271016d2ae2ec10f',
-    concurrent_builds: 1,
-    distro_name: 'ubuntu',
-    distro_version: '1604',
-    env: env,
-    extra_codecov_flags: ["proxy"],
-    golden_images_branch: 'master',
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'runtests-zeromq',
-    nox_passthrough_opts: '--proxy',
-    python_version: 'py3',
-    testrun_timeout: 6,
-    force_run_full: true,
-    disable_from_filenames: true,
-    use_spot_instances: true)
-
-// vim: ft=groovy

cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0271016d2ae2ec10f',
+    ami_image_id: 'ami-095abce041f0323d2',
     concurrent_builds: 1,
     distro_name: 'ubuntu',
     distro_version: '1604',

cicd/jenkins/kitchen-ubuntu1604-py3-pycryptodome-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0271016d2ae2ec10f',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-095abce041f0323d2',
+    concurrent_builds: 1,
     distro_name: 'ubuntu',
     distro_version: '1604',
     env: env,

cicd/jenkins/kitchen-ubuntu1604-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0271016d2ae2ec10f',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-095abce041f0323d2',
+    concurrent_builds: 1,
     distro_name: 'ubuntu',
     distro_version: '1604',
     env: env,

cicd/jenkins/kitchen-ubuntu1604-py3-tcp

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0271016d2ae2ec10f',
+    ami_image_id: 'ami-095abce041f0323d2',
     concurrent_builds: 1,
     distro_name: 'ubuntu',
     distro_version: '1604',

cicd/jenkins/kitchen-ubuntu1604-py3-tcp-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0271016d2ae2ec10f',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-095abce041f0323d2',
+    concurrent_builds: 1,
     distro_name: 'ubuntu',
     distro_version: '1604',
     env: env,

cicd/jenkins/kitchen-ubuntu1804-py3

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-04523b8fccbe50f92',
+    ami_image_id: 'ami-0decb138fa5e24979',
     concurrent_builds: 1,
     distro_name: 'ubuntu',
     distro_version: '1804',

cicd/jenkins/kitchen-ubuntu1804-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-04523b8fccbe50f92',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-0decb138fa5e24979',
+    concurrent_builds: 1,
     distro_name: 'ubuntu',
     distro_version: '1804',
     env: env,

cicd/jenkins/kitchen-ubuntu2004-py3

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0c9da3934b68eb896',
+    ami_image_id: 'ami-0468248e8ecfacd5c',
     concurrent_builds: 1,
     distro_name: 'ubuntu',
     distro_version: '2004',

cicd/jenkins/kitchen-ubuntu2004-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0c9da3934b68eb896',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-0468248e8ecfacd5c',
+    concurrent_builds: 1,
     distro_name: 'ubuntu',
     distro_version: '2004',
     env: env,

cicd/jenkins/kitchen-windows2016-py3

@@ -1,7 +1,7 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0acded867073c36c3',
+    ami_image_id: 'ami-091ceee536c181547',
     concurrent_builds: 1,
     distro_name: 'windows',
     distro_version: '2016',

cicd/jenkins/kitchen-windows2016-py3-pytest

@@ -1,8 +1,8 @@
-@Library('salt@master-1.7') _
+@Library('salt@master-1.9') _
 
 runTestSuite(
-    ami_image_id: 'ami-0acded867073c36c3',
-    concurrent_builds: 2,
+    ami_image_id: 'ami-091ceee536c181547',
+    concurrent_builds: 1,
     distro_name: 'windows',
     distro_version: '2016',
     env: env,