On 05 Feb 23:39, Uwe Werler wrote: > Hi, > > this is an update to salt 2019.2.3. > > I'm currently testing this version on our development salt master and haven't > seen any issues yet wether with the master nor the minion. > > Comments welcome. > > Regards Uwe
Hi, I included some changes Rafael suggested. But still the port needs further testing. Also cc to Jasper now. Regards Uwe
Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/salt/Makefile,v retrieving revision 1.135 diff -u -p -u -r1.135 Makefile --- Makefile 12 Jul 2019 20:49:51 -0000 1.135 +++ Makefile 6 Feb 2020 10:29:07 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.135 2019/07/12 20:49:51 sthen Exp $ # optional dependencies -# https://github.com/saltstack/salt/blob/develop/doc/conf.py#L54 +# https://github.com/saltstack/salt/blob/develop/doc/conf.py # libvirt-python # py-GitPython # py-croniter @@ -17,13 +17,12 @@ COMMENT = remote execution and configuration management system -MODPY_EGG_VERSION = 2018.3.3 +MODPY_EGG_VERSION = 2019.2.3 DISTNAME = salt-${MODPY_EGG_VERSION} -REVISION = 0 CATEGORIES = sysutils net devel -HOMEPAGE = http://saltstack.org/ +HOMEPAGE = https://community.saltstack.com MAINTAINER = Jasper Lievisse Adriaanse <jas...@openbsd.org> @@ -71,10 +70,6 @@ TEST_DEPENDS = databases/py-mysql \ net/rabbitmq \ sysutils/salt-testing \ www/py-CherryPy - -# https://github.com/saltstack/salt/pull/45164 -post-extract: - cp ${FILESDIR}/{pf,vmctl}.py ${WRKSRC}/salt/modules/ pre-configure: ${SUBST_CMD} ${WRKSRC}/salt/returners/zabbix_return.py Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/salt/distinfo,v retrieving revision 1.49 diff -u -p -u -r1.49 distinfo --- distinfo 28 Jan 2019 19:25:27 -0000 1.49 +++ distinfo 6 Feb 2020 10:29:07 -0000 @@ -1,2 +1,2 @@ -SHA256 (salt-2018.3.3.tar.gz) = 3PMNLo6uEFpyl3xRz8JT+8TcKLL3Enf9zp013h62PhU= -SIZE (salt-2018.3.3.tar.gz) = 13953724 +SHA256 (salt-2019.2.3.tar.gz) = dJfn2/1Nw3mbu8jaY9qYuDAbu2RBUPOQX+V3Wn2BJxo= +SIZE (salt-2019.2.3.tar.gz) = 14572686 Index: files/pf.py =================================================================== RCS file: files/pf.py diff -N files/pf.py --- files/pf.py 24 May 2018 16:59:40 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,349 +0,0 @@ -# -*- coding: utf-8 -*- -''' -Control the OpenBSD packet filter (PF). - -:codeauthor: Jasper Lievisse Adriaanse <j...@jasper.la> - -.. versionadded:: Fluorine -''' - -from __future__ import absolute_import - -# Import python libs -import logging -import re - -# Import salt libs -import salt.utils.path -from salt.exceptions import (CommandExecutionError, SaltInvocationError) - -log = logging.getLogger(__name__) - - -def __virtual__(): - ''' - Only works on OpenBSD for now; other systems with pf (macOS, FreeBSD, etc) - need to be tested before enabling them. - ''' - if __grains__['os'] == 'OpenBSD' and salt.utils.path.which('pfctl'): - return True - - return (False, 'The pf execution module cannot be loaded: either the system is not OpenBSD or the pfctl binary was not found') - - -def enable(): - ''' - Enable the Packet Filter. - - CLI example: - - .. code-block:: bash - - salt '*' pf.enable - ''' - ret = {} - result = __salt__['cmd.run_all']('pfctl -e', - output_loglevel='trace', - python_shell=False) - - if result['retcode'] == 0: - ret = {'comment': 'pf enabled', 'changes': True} - else: - # If pf was already enabled the return code is also non-zero. - # Don't raise an exception in that case. - if result['stderr'] == 'pfctl: pf already enabled': - ret = {'comment': 'pf already enabled', 'changes': False} - else: - raise CommandExecutionError( - 'Could not enable pf', - info={'errors': [result['stderr']], 'changes': False} - ) - - return ret - - -def disable(): - ''' - Disable the Packet Filter. - - CLI example: - - .. code-block:: bash - - salt '*' pf.disable - ''' - ret = {} - result = __salt__['cmd.run_all']('pfctl -d', - output_loglevel='trace', - python_shell=False) - - if result['retcode'] == 0: - ret = {'comment': 'pf disabled', 'changes': True} - else: - # If pf was already disabled the return code is also non-zero. - # Don't raise an exception in that case. - if result['stderr'] == 'pfctl: pf not enabled': - ret = {'comment': 'pf already disabled', 'changes': False} - else: - raise CommandExecutionError( - 'Could not disable pf', - info={'errors': [result['stderr']], 'changes': False} - ) - - return ret - - -def loglevel(level): - ''' - Set the debug level which limits the severity of log messages printed by ``pf(4)``. - - level: - Log level. Should be one of the following: emerg, alert, crit, err, warning, notice, - info or debug. - - CLI example: - - .. code-block:: bash - - salt '*' pf.loglevel emerg - ''' - # There's no way to getting the previous loglevel so imply we've - # always made a change. - ret = {'changes': True} - - all_levels = ['emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug'] - if level not in all_levels: - raise SaltInvocationError('Unknown loglevel: {0}'.format(level)) - - result = __salt__['cmd.run_all']('pfctl -x {0}'.format(level), - output_loglevel='trace', - python_shell=False) - - if result['retcode'] != 0: - raise CommandExecutionError( - 'Problem encountered setting loglevel', - info={'errors': [result['stderr']], 'changes': False} - ) - - return ret - - -def load(file='/etc/pf.conf', noop=False): - ''' - Load a ruleset from the specific file, overwriting the currently loaded ruleset. - - file: - Full path to the file containing the ruleset. - - noop: - Don't actually load the rules, just parse them. - - CLI example: - - .. code-block:: bash - - salt '*' pf.load /etc/pf.conf.d/lockdown.conf - ''' - # We cannot precisely determine if loading the ruleset implied - # any changes so assume it always does. - ret = {'changes': True} - cmd = ['pfctl', '-f', file] - - if noop: - ret['changes'] = False - cmd.append('-n') - - result = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False) - - if result['retcode'] != 0: - raise CommandExecutionError( - 'Problem loading the ruleset from {0}'.format(file), - info={'errors': [result['stderr']], 'changes': False} - ) - - return ret - - -def flush(modifier): - ''' - Flush the specified packet filter parameters. - - modifier: - Should be one of the following: - - - all - - info - - osfp - - rules - - sources - - states - - tables - - Please refer to the OpenBSD `pfctl(8) <https://man.openbsd.org/pfctl#T>`_ - documentation for a detailed explanation of each command. - - CLI example: - - .. code-block:: bash - - salt '*' pf.flush states - ''' - ret = {} - - all_modifiers = ['rules', 'states', 'info', 'osfp', 'all', 'sources', 'tables'] - - # Accept the following two modifiers to allow for a consistent interface between - # pfctl(8) and Salt. - capital_modifiers = ['Sources', 'Tables'] - all_modifiers += capital_modifiers - if modifier.title() in capital_modifiers: - modifier = modifier.title() - - if modifier not in all_modifiers: - raise SaltInvocationError('Unknown modifier: {0}'.format(modifier)) - - cmd = 'pfctl -v -F {0}'.format(modifier) - result = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False) - - if result['retcode'] == 0: - if re.match(r'^0.*', result['stderr']): - ret['changes'] = False - else: - ret['changes'] = True - - ret['comment'] = result['stderr'] - else: - raise CommandExecutionError( - 'Could not flush {0}'.format(modifier), - info={'errors': [result['stderr']], 'changes': False} - ) - - return ret - - -def table(command, table, **kwargs): - ''' - Apply a command on the specified table. - - table: - Name of the table. - - command: - Command to apply to the table. Supported commands are: - - - add - - delete - - expire - - flush - - kill - - replace - - show - - test - - zero - - Please refer to the OpenBSD `pfctl(8) <https://man.openbsd.org/pfctl#T>`_ - documentation for a detailed explanation of each command. - - CLI example: - - .. code-block:: bash - - salt '*' pf.table expire table=spam_hosts number=300 - salt '*' pf.table add table=local_hosts addresses='["127.0.0.1", "::1"]' - ''' - ret = {} - - all_commands = ['kill', 'flush', 'add', 'delete', 'expire', 'replace', 'show', 'test', 'zero'] - if command not in all_commands: - raise SaltInvocationError('Unknown table command: {0}'.format(command)) - - cmd = ['pfctl', '-t', table, '-T', command] - - if command in ['add', 'delete', 'replace', 'test']: - cmd += kwargs.get('addresses', []) - elif command == 'expire': - number = kwargs.get('number', None) - if not number: - raise SaltInvocationError('need expire_number argument for expire command') - else: - cmd.append(number) - - result = __salt__['cmd.run_all'](cmd, - output_level='trace', - python_shell=False) - - if result['retcode'] == 0: - if command == 'show': - ret = {'comment': result['stdout'].split()} - elif command == 'test': - ret = {'comment': result['stderr'], 'matches': True} - else: - if re.match(r'^(0.*|no changes)', result['stderr']): - ret['changes'] = False - else: - ret['changes'] = True - - ret['comment'] = result['stderr'] - else: - # 'test' returns a non-zero code if the address didn't match, even if - # the command itself ran fine; also set 'matches' to False since not - # everything matched. - if command == 'test' and re.match(r'^\d+/\d+ addresses match.$', result['stderr']): - ret = {'comment': result['stderr'], 'matches': False} - else: - raise CommandExecutionError( - 'Could not apply {0} on table {1}'.format(command, table), - info={'errors': [result['stderr']], 'changes': False} - ) - - return ret - - -def show(modifier): - ''' - Show filter parameters. - - modifier: - Modifier to apply for filtering. Only a useful subset of what pfctl supports - can be used with Salt. - - - rules - - states - - tables - - CLI example: - - .. code-block:: bash - - salt '*' pf.show rules - ''' - # By definition showing the parameters makes no changes. - ret = {'changes': False} - - capital_modifiers = ['Tables'] - all_modifiers = ['rules', 'states', 'tables'] - all_modifiers += capital_modifiers - if modifier.title() in capital_modifiers: - modifier = modifier.title() - - if modifier not in all_modifiers: - raise SaltInvocationError('Unknown modifier: {0}'.format(modifier)) - - cmd = 'pfctl -s {0}'.format(modifier) - result = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False) - - if result['retcode'] == 0: - ret['comment'] = result['stdout'].split('\n') - else: - raise CommandExecutionError( - 'Could not show {0}'.format(modifier), - info={'errors': [result['stderr']], 'changes': False} - ) - - return ret Index: files/vmctl.py =================================================================== RCS file: files/vmctl.py diff -N files/vmctl.py --- files/vmctl.py 24 May 2018 16:59:40 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,404 +0,0 @@ -# -*- coding: utf-8 -*- -# $OpenBSD: vmctl.py,v 1.3 2018/05/24 16:59:40 jasper Exp $ -''' -Manage vms running on the OpenBSD VMM hypervisor using vmctl(8). - -.. versionadded:: Fluorine - -:codeauthor: :email:`Jasper Lievisse Adriaanse <jas...@openbsd.org>` - -.. note:: - - This module requires the `vmd` service to be running on the OpenBSD - target machine. -''' - -from __future__ import absolute_import - -# Import python libs -import logging -import re - -# Imoprt salt libs: -import salt.utils.path -from salt.exceptions import (CommandExecutionError, SaltInvocationError) -from salt.ext.six.moves import zip - -log = logging.getLogger(__name__) - - -def __virtual__(): - ''' - Only works on OpenBSD with vmctl(8) present. - ''' - if __grains__['os'] == 'OpenBSD' and salt.utils.path.which('vmctl'): - return True - - return (False, 'The vmm execution module cannot be loaded: either the system is not OpenBSD or the vmctl binary was not found') - - -def _id_to_name(id): - ''' - Lookup the name associated with a VM id. - ''' - vm = status(id=id) - if vm == {}: - return None - else: - return vm['name'] - - -def create_disk(name, size): - ''' - Create a VMM disk with the specified `name` and `size`. - - size: - Size in megabytes, or use a specifier such as M, G, T. - - CLI Example: - - .. code-block:: bash - - salt '*' vmctl.create_disk /path/to/disk.img size=10G - ''' - ret = False - cmd = 'vmctl create {0} -s {1}'.format(name, size) - - result = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False) - - if result['retcode'] == 0: - ret = True - else: - raise CommandExecutionError( - 'Problem encountered creating disk image', - info={'errors': [result['stderr']], 'changes': ret} - ) - - return ret - - -def load(path): - ''' - Load additional configuration from the specified file. - - path - Path to the configuration file. - - CLI Example: - - .. code-block:: bash - - salt '*' vmctl.load path=/etc/vm.switches.conf - ''' - ret = False - cmd = 'vmctl load {0}'.format(path) - result = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False) - if result['retcode'] == 0: - ret = True - else: - raise CommandExecutionError( - 'Problem encountered running vmctl', - info={'errors': [result['stderr']], 'changes': ret} - ) - - return ret - - -def reload(): - ''' - Remove all stopped VMs and reload configuration from the default configuration file. - - CLI Example: - - .. code-block:: bash - - salt '*' vmctl.reload - ''' - ret = False - cmd = 'vmctl reload' - result = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False) - if result['retcode'] == 0: - ret = True - else: - raise CommandExecutionError( - 'Problem encountered running vmctl', - info={'errors': [result['stderr']], 'changes': ret} - ) - - return ret - - -def reset(all=False, vms=False, switches=False): - ''' - Reset the running state of VMM or a subsystem. - - all: - Reset the running state. - - switches: - Reset the configured switches. - - vms: - Reset and terminate all VMs. - - - CLI Example: - - .. code-block:: bash - - salt '*' vmctl.reset all=True - ''' - ret = False - cmd = ['vmctl', 'reset'] - - if all: - cmd.append('all') - elif vms: - cmd.append('vms') - elif switches: - cmd.append('switches') - - result = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False) - if result['retcode'] == 0: - ret = True - else: - raise CommandExecutionError( - 'Problem encountered running vmctl', - info={'errors': [result['stderr']], 'changes': ret} - ) - - return ret - - -def start(name=None, id=None, bootpath=None, disk=None, disks=None, local_iface=False, - memory=None, nics=0, switch=None): - ''' - Starts a VM defined by the specified parameters. - When both a name and id are provided, the id is ignored. - - name: - Name of the defined VM. - - id: - VM id. - - bootpath: - Path to a kernel or BIOS image to load. - - disk: - Path to a single disk to use. - - disks: - List of multiple disks to use. - - local_iface: - Whether to add a local network interface. See "LOCAL INTERFACES" - in the vmctl(8) manual page for more information. - - memory: - Memory size of the VM specified in megabytes. - - switch: - Add a network interface that is attached to the specified - virtual switch on the host. - - CLI Example: - - .. code-block:: bash - - salt '*' vmctl.start 2 # start VM with id 2 - salt '*' vmctl.start name=web1 bootpath='/bsd.rd' nics=2 memory=512M disk='/disk.img' - ''' - ret = {'changes': False, 'console': None} - cmd = ['vmctl', 'start'] - - if not (name or id): - raise SaltInvocationError('Must provide either "name" or "id"') - elif name: - cmd.append(name) - else: - cmd.append(id) - name = _id_to_name(id) - - if nics > 0: - cmd.append('-i {0}'.format(nics)) - - # Paths cannot be appended as otherwise the inserted whitespace is treated by - # vmctl as being part of the path. - if bootpath: - cmd.extend(['-b', bootpath]) - - if memory: - cmd.append('-m {0}'.format(memory)) - - if switch: - cmd.append('-n {0}'.format(switch)) - - if local_iface: - cmd.append('-L') - - if disk and (disks and len(disks) > 0): - raise SaltInvocationError('Must provide either "disks" or "disk"') - - if disk: - cmd.extend(['-d', disk]) - - if disks and len(disks) > 0: - cmd.extend(['-d', x] for x in disks) - - # Before attempting to define a new VM, make sure it doesn't already exist. - # Otherwise return to indicate nothing was changed. - if len(cmd) > 3: - vmstate = status(name) - if vmstate: - ret['comment'] = 'VM already exists and cannot be redefined' - return ret - - result = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False) - - if result['retcode'] == 0: - ret['changes'] = True - m = re.match(r'.*successfully, tty (\/dev.*)', result['stderr']) - if m: - ret['console'] = m.groups()[0] - else: - m = re.match(r'.*Operation already in progress$', result['stderr']) - if m: - ret['changes'] = False - else: - raise CommandExecutionError( - 'Problem encountered running vmctl', - info={'errors': [result['stderr']], 'changes': ret} - ) - - return ret - - -def status(name=None, id=None): - ''' - List VMs running on the host, or only the VM specified by ``id''. - When both a name and id are provided, the id is ignored. - - name: - Name of the defined VM. - - id: - VM id. - - CLI Example: - - .. code-block:: bash - - salt '*' vmctl.status # to list all VMs - salt '*' vmctl.status name=web1 # to get a single VM - ''' - ret = {} - cmd = ['vmctl', 'status'] - - result = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False) - - if result['retcode'] != 0: - raise CommandExecutionError( - 'Problem encountered running vmctl', - info={'error': [result['stderr']], 'changes': ret} - ) - - # Grab the header and save it with the lowercase names. - header = result['stdout'].splitlines()[0].split() - header = list([x.lower() for x in header]) - - # A VM can be in one of the following states (from vmm.c:vcpu_state_decode()) - # - stopped - # - running - # - requesting termination - # - terminated - # - unknown - - for line in result['stdout'].splitlines()[1:]: - data = line.split() - vm = dict(list(zip(header, data))) - vmname = vm.pop('name') - if vm['pid'] == '-': - # If the VM has no PID it's not running. - vm['state'] = 'stopped' - elif vmname and data[-2] == '-': - # When a VM does have a PID and the second to last field is a '-', it's - # transitioning to another state. A VM name itself cannot contain a - # '-' so it's safe to split on '-'. - vm['state'] = data[-1] - else: - vm['state'] = 'running' - - # When the status is requested of a single VM (by name) which is stopping, - # vmctl doesn't print the status line. So we'll parse the full list and - # return when we've found the requested VM. - if id and int(vm['id']) == id: - return {vmname: vm} - elif name and vmname == name: - return {vmname: vm} - else: - ret[vmname] = vm - - # Assert we've not come this far when an id or name have been provided. That - # means the requested VM does not exist. - if id or name: - return {} - - return ret - - -def stop(name=None, id=None): - ''' - Stop (terminate) the VM identified by the given id or name. - When both a name and id are provided, the id is ignored. - - name: - Name of the defined VM. - - id: - VM id. - - CLI Example: - - .. code-block:: bash - - salt '*' vmctl.stop name=alpine - ''' - ret = {} - cmd = ['vmctl', 'stop'] - - if not (name or id): - raise SaltInvocationError('Must provide either "name" or "id"') - elif name: - cmd.append(name) - else: - cmd.append(id) - - result = __salt__['cmd.run_all'](cmd, - output_loglevel='trace', - python_shell=False) - - if result['retcode'] == 0: - if re.match('^vmctl: sent request to terminate vm.*', result['stderr']): - ret['changes'] = True - else: - ret['changes'] = False - else: - raise CommandExecutionError( - 'Problem encountered running vmctl', - info={'errors': [result['stderr']], 'changes': ret} - ) - - return ret Index: patches/patch-salt_modules_openbsd_sysctl_py =================================================================== RCS file: patches/patch-salt_modules_openbsd_sysctl_py diff -N patches/patch-salt_modules_openbsd_sysctl_py --- patches/patch-salt_modules_openbsd_sysctl_py 25 Apr 2018 10:02:48 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,28 +0,0 @@ -$OpenBSD: patch-salt_modules_openbsd_sysctl_py,v 1.2 2018/04/25 10:02:48 jasper Exp $ - -https://github.com/saltstack/salt/pull/45228 - -Index: salt/modules/openbsd_sysctl.py ---- salt/modules/openbsd_sysctl.py.orig -+++ salt/modules/openbsd_sysctl.py -@@ -4,6 +4,7 @@ Module for viewing and modifying OpenBSD sysctl parame - ''' - from __future__ import absolute_import, print_function, unicode_literals - import os -+import re - - # Import salt libs - from salt.ext import six -@@ -76,7 +77,11 @@ def assign(name, value): - cmd = 'sysctl {0}="{1}"'.format(name, value) - data = __salt__['cmd.run_all'](cmd) - -- if data['retcode'] != 0: -+ # Certain values cannot be set from this console, at the current -+ # securelevel or there are other restrictions that prevent us -+ # from applying the setting rightaway. -+ if re.match(r'^sysctl:.*: Operation not permitted$', data['stderr']) or \ -+ data['retcode'] != 0: - raise CommandExecutionError('sysctl failed: {0}'.format( - data['stderr'])) - new_name, new_value = data['stdout'].split(':', 1) Index: patches/patch-salt_modules_openbsdpkg_py =================================================================== RCS file: patches/patch-salt_modules_openbsdpkg_py diff -N patches/patch-salt_modules_openbsdpkg_py --- patches/patch-salt_modules_openbsdpkg_py 25 Apr 2018 10:02:48 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,187 +0,0 @@ -$OpenBSD: patch-salt_modules_openbsdpkg_py,v 1.2 2018/04/25 10:02:48 jasper Exp $ - -- fix `latest_version` for installed packages -- have purge pass '-cqq' to pkg_delete -- implement upgrading packages - -Index: salt/modules/openbsdpkg.py ---- salt/modules/openbsdpkg.py.orig -+++ salt/modules/openbsdpkg.py -@@ -100,8 +100,13 @@ def list_pkgs(versions_as_list=False, **kwargs): - - def latest_version(*names, **kwargs): - ''' -- The available version of the package in the repository -+ Return the latest version of the named package available for upgrade or -+ installation. If more than one package name is specified, a dict of -+ name/version pairs is returned. - -+ If the latest version of a given package is already installed, an empty -+ string will be returned for that package. -+ - CLI Example: - - .. code-block:: bash -@@ -116,20 +121,43 @@ def latest_version(*names, **kwargs): - for name in names: - ret[name] = '' - -- cmd = 'pkg_info -q -I {0}'.format(' '.join(names)) -- out = __salt__['cmd.run_stdout'](cmd, python_shell=False, output_loglevel='trace') -- for line in out.splitlines(): -- try: -- pkgname, pkgver, flavor = __PKG_RE.match(line).groups() -- except AttributeError: -- continue -- pkgname += '--{0}'.format(flavor) if flavor else '' -- cur = pkgs.get(pkgname, '') -- if not cur or salt.utils.versions.compare(ver1=cur, -- oper='<', -- ver2=pkgver): -- ret[pkgname] = pkgver -+ # Query the repository for the package name -+ cmd = 'pkg_info -Q {0}'.format(name) -+ out = __salt__['cmd.run_stdout'](cmd, python_shell=False, output_loglevel='trace') -+ -+ # Since we can only query instead of request the specific package -+ # we'll have to go through the returned list and find what we -+ # were looking for. -+ # Keep in mind the match may be flavored. -+ for line in out.splitlines(): -+ try: -+ pkgname, pkgver, flavor = __PKG_RE.match(line).groups() -+ except AttributeError: -+ continue - -+ match = re.match(r'.*\(installed\)$', pkgver) -+ if match: -+ # Package is explicitly marked as installed already, -+ # so skip any further comparison and move on to the -+ # next package to compare (if provided). -+ break -+ -+ # First check if we need to look for flavors before -+ # looking at unflavored packages. -+ if "{0}--{1}".format(pkgname, flavor) == name: -+ pkgname += '--{0}'.format(flavor) -+ elif pkgname == name: -+ pass -+ else: -+ # No match just move on. -+ continue -+ -+ cur = pkgs.get(pkgname, '') -+ if not cur or salt.utils.versions.compare_versions(ver1=cur, -+ oper='<', -+ ver2=pkgver): -+ ret[pkgname] = pkgver -+ - # Return a string if only one package name passed - if len(names) == 1: - return ret[names[0]] -@@ -221,7 +249,7 @@ def install(name=None, pkgs=None, sources=None, **kwar - return ret - - --def remove(name=None, pkgs=None, **kwargs): -+def remove(name=None, pkgs=None, purge=False, **kwargs): - ''' - Remove a single package with pkg_delete - -@@ -255,8 +283,13 @@ def remove(name=None, pkgs=None, **kwargs): - if not targets: - return {} - -- cmd = 'pkg_delete -xD dependencies {0}'.format(' '.join(targets)) -+ cmd = ['pkg_delete', '-Ix', '-Ddependencies'] - -+ if purge: -+ cmd.append('-cqq') -+ -+ cmd.extend(targets) -+ - out = __salt__['cmd.run_all']( - cmd, - python_shell=False, -@@ -282,8 +315,7 @@ def remove(name=None, pkgs=None, **kwargs): - - def purge(name=None, pkgs=None, **kwargs): - ''' -- Package purges are not supported, this function is identical to -- ``remove()``. -+ Remove a package and extra configuration files. - - name - The name of the package to be deleted. -@@ -308,4 +340,70 @@ def purge(name=None, pkgs=None, **kwargs): - salt '*' pkg.purge <package1>,<package2>,<package3> - salt '*' pkg.purge pkgs='["foo", "bar"]' - ''' -- return remove(name=name, pkgs=pkgs) -+ return remove(name=name, pkgs=pkgs, purge=True) -+ -+ -+def upgrade_available(name): -+ ''' -+ Check whether or not an upgrade is available for a given package -+ -+ CLI Example: -+ -+ .. code-block:: bash -+ -+ salt '*' pkg.upgrade_available <package name> -+ ''' -+ return latest_version(name) != '' -+ -+ -+def upgrade(name=None, -+ pkgs=None, -+ **kwargs): -+ ''' -+ Run a full package upgrade (``pkg_add -u``), or upgrade a specific package -+ if ``name`` or ``pkgs`` is provided. -+ ``name`` is ignored when ``pkgs`` is specified. -+ -+ Returns a dictionary containing the changes: -+ -+ .. code-block:: python -+ -+ {'<package>': {'old': '<old-version>', -+ 'new': '<new-version>'}} -+ -+ -+ CLI Example: -+ -+ .. code-block:: bash -+ -+ salt '*' pkg.upgrade -+ salt '*' pkg.upgrade python%2.7 -+ ''' -+ old = list_pkgs() -+ -+ cmd = ['pkg_add', '-Ix', '-u'] -+ -+ if kwargs.get('noop', False): -+ cmd.append('-n') -+ -+ if pkgs: -+ cmd.extend(pkgs) -+ elif name: -+ cmd.append(name) -+ -+ # Now run the upgrade, compare the list of installed packages before and -+ # after and we have all the info we need. -+ result = __salt__['cmd.run_all'](cmd, output_loglevel='trace', -+ python_shell=False) -+ -+ __context__.pop('pkg.list_pkgs', None) -+ new = list_pkgs() -+ ret = salt.utils.compare_dicts(old, new) -+ -+ if result['retcode'] != 0: -+ raise CommandExecutionError( -+ 'Problem encountered upgrading packages', -+ info={'changes': ret, 'result': result} -+ ) -+ -+ return ret Index: patches/patch-salt_returners_zabbix_return_py =================================================================== RCS file: /cvs/ports/sysutils/salt/patches/patch-salt_returners_zabbix_return_py,v retrieving revision 1.1 diff -u -p -u -r1.1 patch-salt_returners_zabbix_return_py --- patches/patch-salt_returners_zabbix_return_py 25 Apr 2018 17:16:19 -0000 1.1 +++ patches/patch-salt_returners_zabbix_return_py 6 Feb 2020 10:29:07 -0000 @@ -1,9 +1,9 @@ $OpenBSD: patch-salt_returners_zabbix_return_py,v 1.1 2018/04/25 17:16:19 robert Exp $ Index: salt/returners/zabbix_return.py ---- salt/returners/zabbix_return.py.orig -+++ salt/returners/zabbix_return.py -@@ -47,8 +47,8 @@ def zbx(): +--- salt/returners/zabbix_return.py.orig Wed Feb 5 11:27:41 2020 ++++ salt/returners/zabbix_return.py Wed Feb 5 11:28:12 2020 +@@ -40,8 +40,8 @@ def zbx(): zabbix_sender = '/usr/local/zabbix/bin/zabbix_sender' zabbix_config = '/usr/local/zabbix/etc/zabbix_agentd.conf' return {"sender": zabbix_sender, "config": zabbix_config} Index: patches/patch-salt_utils_gitfs_py =================================================================== RCS file: patches/patch-salt_utils_gitfs_py diff -N patches/patch-salt_utils_gitfs_py --- patches/patch-salt_utils_gitfs_py 28 Feb 2019 16:34:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,76 +0,0 @@ -$OpenBSD: patch-salt_utils_gitfs_py,v 1.1 2019/02/28 16:34:59 jasper Exp $ - -https://github.com/saltstack/salt/pull/51304/commits/c02757d70b38813e566a47954fc1118a55c8116d - -Index: salt/utils/gitfs.py ---- salt/utils/gitfs.py.orig -+++ salt/utils/gitfs.py -@@ -1395,6 +1395,19 @@ class Pygit2(GitProvider): - override_params, cache_root, role - ) - -+ def peel(self, obj): -+ ''' -+ Compatibility function for pygit2.Reference objects. Older versions of -+ pygit2 use .get_object() to return the object to which the reference -+ points, while newer versions use .peel(). In pygit2 0.27.4, -+ .get_object() was removed. This function will try .peel() first and -+ fall back to .get_object(). -+ ''' -+ try: -+ return obj.peel() -+ except AttributeError: -+ return obj.get_object() -+ - def checkout(self): - ''' - Checkout the configured branch/tag -@@ -1413,7 +1426,7 @@ class Pygit2(GitProvider): - return None - - try: -- head_sha = local_head.get_object().hex -+ head_sha = self.peel(local_head).hex - except AttributeError: - # Shouldn't happen, but just in case a future pygit2 API change - # breaks things, avoid a traceback and log an error. -@@ -1462,7 +1475,7 @@ class Pygit2(GitProvider): - try: - if remote_ref in refs: - # Get commit id for the remote ref -- oid = self.repo.lookup_reference(remote_ref).get_object().id -+ oid = self.peel(self.repo.lookup_reference(remote_ref)).id - if local_ref not in refs: - # No local branch for this remote, so create one and point - # it at the commit id of the remote ref -@@ -1470,7 +1483,7 @@ class Pygit2(GitProvider): - - try: - target_sha = \ -- self.repo.lookup_reference(remote_ref).get_object().hex -+ self.peel(self.repo.lookup_reference(remote_ref)).hex - except KeyError: - log.error( - 'pygit2 was unable to get SHA for %s in %s remote ' -@@ -1848,8 +1861,8 @@ class Pygit2(GitProvider): - refs/remotes/origin/ - ''' - try: -- return self.repo.lookup_reference( -- 'refs/remotes/origin/{0}'.format(ref)).get_object().tree -+ return self.peel(self.repo.lookup_reference( -+ 'refs/remotes/origin/{0}'.format(ref))).tree - except KeyError: - return None - -@@ -1858,8 +1871,8 @@ class Pygit2(GitProvider): - Return a pygit2.Tree object matching a tag ref fetched into refs/tags/ - ''' - try: -- return self.repo.lookup_reference( -- 'refs/tags/{0}'.format(ref)).get_object().tree -+ return self.peel(self.repo.lookup_reference( -+ 'refs/tags/{0}'.format(ref))).tree - except KeyError: - return None - Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/sysutils/salt/pkg/PLIST,v retrieving revision 1.53 diff -u -p -u -r1.53 PLIST --- pkg/PLIST 28 Jan 2019 19:25:27 -0000 1.53 +++ pkg/PLIST 6 Feb 2020 10:29:09 -0000 @@ -112,12 +112,18 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/beacons/service.pyc lib/python${MODPY_VERSION}/site-packages/salt/beacons/sh.py lib/python${MODPY_VERSION}/site-packages/salt/beacons/sh.pyc +lib/python${MODPY_VERSION}/site-packages/salt/beacons/smartos_imgadm.py +lib/python${MODPY_VERSION}/site-packages/salt/beacons/smartos_imgadm.pyc +lib/python${MODPY_VERSION}/site-packages/salt/beacons/smartos_vmadm.py +lib/python${MODPY_VERSION}/site-packages/salt/beacons/smartos_vmadm.pyc lib/python${MODPY_VERSION}/site-packages/salt/beacons/status.py lib/python${MODPY_VERSION}/site-packages/salt/beacons/status.pyc lib/python${MODPY_VERSION}/site-packages/salt/beacons/telegram_bot_msg.py lib/python${MODPY_VERSION}/site-packages/salt/beacons/telegram_bot_msg.pyc lib/python${MODPY_VERSION}/site-packages/salt/beacons/twilio_txt_msg.py lib/python${MODPY_VERSION}/site-packages/salt/beacons/twilio_txt_msg.pyc +lib/python${MODPY_VERSION}/site-packages/salt/beacons/watchdog.py +lib/python${MODPY_VERSION}/site-packages/salt/beacons/watchdog.pyc lib/python${MODPY_VERSION}/site-packages/salt/beacons/wtmp.py lib/python${MODPY_VERSION}/site-packages/salt/beacons/wtmp.pyc lib/python${MODPY_VERSION}/site-packages/salt/cache/ @@ -394,10 +400,12 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/engines/ircbot.pyc lib/python${MODPY_VERSION}/site-packages/salt/engines/junos_syslog.py lib/python${MODPY_VERSION}/site-packages/salt/engines/junos_syslog.pyc +lib/python${MODPY_VERSION}/site-packages/salt/engines/libvirt_events.py +lib/python${MODPY_VERSION}/site-packages/salt/engines/libvirt_events.pyc lib/python${MODPY_VERSION}/site-packages/salt/engines/logentries.py lib/python${MODPY_VERSION}/site-packages/salt/engines/logentries.pyc -lib/python${MODPY_VERSION}/site-packages/salt/engines/logstash.py -lib/python${MODPY_VERSION}/site-packages/salt/engines/logstash.pyc +lib/python${MODPY_VERSION}/site-packages/salt/engines/logstash_engine.py +lib/python${MODPY_VERSION}/site-packages/salt/engines/logstash_engine.pyc lib/python${MODPY_VERSION}/site-packages/salt/engines/napalm_syslog.py lib/python${MODPY_VERSION}/site-packages/salt/engines/napalm_syslog.pyc lib/python${MODPY_VERSION}/site-packages/salt/engines/reactor.py @@ -423,6 +431,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/executors/__init__.pyc lib/python${MODPY_VERSION}/site-packages/salt/executors/direct_call.py lib/python${MODPY_VERSION}/site-packages/salt/executors/direct_call.pyc +lib/python${MODPY_VERSION}/site-packages/salt/executors/docker.py +lib/python${MODPY_VERSION}/site-packages/salt/executors/docker.pyc lib/python${MODPY_VERSION}/site-packages/salt/executors/splay.py lib/python${MODPY_VERSION}/site-packages/salt/executors/splay.pyc lib/python${MODPY_VERSION}/site-packages/salt/executors/sudo.py @@ -541,6 +551,46 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/log/setup.pyc lib/python${MODPY_VERSION}/site-packages/salt/master.py lib/python${MODPY_VERSION}/site-packages/salt/master.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/ +lib/python${MODPY_VERSION}/site-packages/salt/matchers/__init__.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/cache_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/cache_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/compound_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/compound_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/compound_pillar_exact_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/compound_pillar_exact_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/confirm_top.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/confirm_top.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/data_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/data_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/glob_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/glob_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/grain_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/grain_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/grain_pcre_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/grain_pcre_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/ipcidr_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/ipcidr_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/list_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/list_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/nodegroup_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/nodegroup_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/pcre_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/pcre_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/pillar_exact_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/pillar_exact_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/pillar_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/pillar_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/pillar_pcre_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/pillar_pcre_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/matchers/range_match.py +lib/python${MODPY_VERSION}/site-packages/salt/matchers/range_match.pyc +lib/python${MODPY_VERSION}/site-packages/salt/metaproxy/ +lib/python${MODPY_VERSION}/site-packages/salt/metaproxy/__init__.py +lib/python${MODPY_VERSION}/site-packages/salt/metaproxy/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/salt/metaproxy/proxy.py +lib/python${MODPY_VERSION}/site-packages/salt/metaproxy/proxy.pyc lib/python${MODPY_VERSION}/site-packages/salt/minion.py lib/python${MODPY_VERSION}/site-packages/salt/minion.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/ @@ -552,6 +602,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/aix_group.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/aix_shadow.py lib/python${MODPY_VERSION}/site-packages/salt/modules/aix_shadow.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/aixpkg.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/aixpkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/aliases.py lib/python${MODPY_VERSION}/site-packages/salt/modules/aliases.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/alternatives.py @@ -564,14 +616,16 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/apcups.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/apf.py lib/python${MODPY_VERSION}/site-packages/salt/modules/apf.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/apk.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/apk.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/apkpkg.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/apkpkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/aptly.py lib/python${MODPY_VERSION}/site-packages/salt/modules/aptly.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/aptpkg.py lib/python${MODPY_VERSION}/site-packages/salt/modules/aptpkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/archive.py lib/python${MODPY_VERSION}/site-packages/salt/modules/archive.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/arista_pyeapi.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/arista_pyeapi.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/artifactory.py lib/python${MODPY_VERSION}/site-packages/salt/modules/artifactory.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/at.py @@ -582,6 +636,12 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/augeas_cfg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/aws_sqs.py lib/python${MODPY_VERSION}/site-packages/salt/modules/aws_sqs.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/azurearm_compute.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/azurearm_compute.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/azurearm_network.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/azurearm_network.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/azurearm_resource.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/azurearm_resource.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/bamboohr.py lib/python${MODPY_VERSION}/site-packages/salt/modules/bamboohr.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/bcache.py @@ -590,8 +650,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/beacons.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/bigip.py lib/python${MODPY_VERSION}/site-packages/salt/modules/bigip.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/bluez.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/bluez.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/bluez_bluetooth.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/bluez_bluetooth.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/boto3_elasticache.py lib/python${MODPY_VERSION}/site-packages/salt/modules/boto3_elasticache.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/boto3_route53.py @@ -686,6 +746,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/chronos.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/cimc.py lib/python${MODPY_VERSION}/site-packages/salt/modules/cimc.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/ciscoconfparse_mod.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/ciscoconfparse_mod.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/cisconso.py lib/python${MODPY_VERSION}/site-packages/salt/modules/cisconso.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/cloud.py @@ -724,14 +786,14 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/deb_apache.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/deb_postgres.py lib/python${MODPY_VERSION}/site-packages/salt/modules/deb_postgres.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/debbuild.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/debbuild.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/debconfmod.py lib/python${MODPY_VERSION}/site-packages/salt/modules/debconfmod.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/debian_ip.py lib/python${MODPY_VERSION}/site-packages/salt/modules/debian_ip.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/debian_service.py lib/python${MODPY_VERSION}/site-packages/salt/modules/debian_service.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/debuild_pkgbuild.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/debuild_pkgbuild.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/defaults.py lib/python${MODPY_VERSION}/site-packages/salt/modules/defaults.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/devmap.py @@ -750,20 +812,20 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/dockercompose.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/dockermod.py lib/python${MODPY_VERSION}/site-packages/salt/modules/dockermod.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/dpkg.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/dpkg.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/dpkg_lowpkg.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/dpkg_lowpkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/drac.py lib/python${MODPY_VERSION}/site-packages/salt/modules/drac.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/dracr.py lib/python${MODPY_VERSION}/site-packages/salt/modules/dracr.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/drbd.py lib/python${MODPY_VERSION}/site-packages/salt/modules/drbd.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/dummyproxy_package.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/dummyproxy_package.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/dummyproxy_pkg.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/dummyproxy_pkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/dummyproxy_service.py lib/python${MODPY_VERSION}/site-packages/salt/modules/dummyproxy_service.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/ebuild.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/ebuild.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/ebuildpkg.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/ebuildpkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/eix.py lib/python${MODPY_VERSION}/site-packages/salt/modules/eix.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/elasticsearch.py @@ -830,6 +892,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/glusterfs.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/gnomedesktop.py lib/python${MODPY_VERSION}/site-packages/salt/modules/gnomedesktop.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/google_chat.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/google_chat.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/gpg.py lib/python${MODPY_VERSION}/site-packages/salt/modules/gpg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/grafana4.py @@ -858,8 +922,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/hipchat.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/hosts.py lib/python${MODPY_VERSION}/site-packages/salt/modules/hosts.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/htpasswd.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/htpasswd.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/http.py lib/python${MODPY_VERSION}/site-packages/salt/modules/http.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/icinga2.py @@ -870,10 +932,10 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/ilo.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/incron.py lib/python${MODPY_VERSION}/site-packages/salt/modules/incron.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/influx.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/influx.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/influx08.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/influx08.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/influxdb08mod.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/influxdb08mod.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/influxdbmod.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/influxdbmod.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/infoblox.py lib/python${MODPY_VERSION}/site-packages/salt/modules/infoblox.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/ini_manage.py @@ -899,6 +961,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/inspector.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/introspect.py lib/python${MODPY_VERSION}/site-packages/salt/modules/introspect.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/iosconfig.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/iosconfig.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/ipmi.py lib/python${MODPY_VERSION}/site-packages/salt/modules/ipmi.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/ipset.py @@ -913,6 +977,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/jboss7_cli.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/jenkinsmod.py lib/python${MODPY_VERSION}/site-packages/salt/modules/jenkinsmod.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/jira_mod.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/jira_mod.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/junos.py lib/python${MODPY_VERSION}/site-packages/salt/modules/junos.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/k8s.py @@ -935,10 +1001,10 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/keystoneng.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/kmod.py lib/python${MODPY_VERSION}/site-packages/salt/modules/kmod.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/kubernetes.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/kubernetes.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/launchctl.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/launchctl.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/kubernetesmod.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/kubernetesmod.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/launchctl_service.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/launchctl_service.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/layman.py lib/python${MODPY_VERSION}/site-packages/salt/modules/layman.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/ldap3.py @@ -975,24 +1041,22 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/lvs.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/lxc.py lib/python${MODPY_VERSION}/site-packages/salt/modules/lxc.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/lxd.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/lxd.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_assistive.py lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_assistive.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_brew.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_brew.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_defaults.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_defaults.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_brew_pkg.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_brew_pkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_desktop.py lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_desktop.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_group.py lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_group.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_keychain.py lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_keychain.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_package.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_package.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_pkgutil.py lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_pkgutil.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_ports.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_ports.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_portspkg.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_portspkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_power.py lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_power.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_service.py @@ -1011,6 +1075,10 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_user.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_xattr.py lib/python${MODPY_VERSION}/site-packages/salt/modules/mac_xattr.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/macdefaults.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/macdefaults.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/macpackage.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/macpackage.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/makeconf.py lib/python${MODPY_VERSION}/site-packages/salt/modules/makeconf.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/mandrill.py @@ -1021,8 +1089,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/match.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/mattermost.py lib/python${MODPY_VERSION}/site-packages/salt/modules/mattermost.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/mdadm.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/mdadm.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/mdadm_raid.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/mdadm_raid.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/mdata.py lib/python${MODPY_VERSION}/site-packages/salt/modules/mdata.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/memcached.py @@ -1057,22 +1125,24 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/nagios.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/nagios_rpc.py lib/python${MODPY_VERSION}/site-packages/salt/modules/nagios_rpc.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/namecheap_dns.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/namecheap_dns.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/namecheap_domains.py lib/python${MODPY_VERSION}/site-packages/salt/modules/namecheap_domains.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/namecheap_ns.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/namecheap_ns.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/namecheap_domains_dns.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/namecheap_domains_dns.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/namecheap_domains_ns.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/namecheap_domains_ns.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/namecheap_ssl.py lib/python${MODPY_VERSION}/site-packages/salt/modules/namecheap_ssl.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/namecheap_users.py lib/python${MODPY_VERSION}/site-packages/salt/modules/namecheap_users.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm_acl.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm_acl.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm_bgp.py lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm_bgp.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm_formula.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm_formula.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm_mod.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm_mod.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm_netacl.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm_netacl.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm_network.py lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm_network.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/napalm_ntp.py @@ -1095,6 +1165,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/netbsd_sysctl.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/netbsdservice.py lib/python${MODPY_VERSION}/site-packages/salt/modules/netbsdservice.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/netmiko_mod.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/netmiko_mod.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/netscaler.py lib/python${MODPY_VERSION}/site-packages/salt/modules/netscaler.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/network.py @@ -1123,14 +1195,16 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/nspawn.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/nxos.py lib/python${MODPY_VERSION}/site-packages/salt/modules/nxos.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/nxos_api.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/nxos_api.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/omapi.py lib/python${MODPY_VERSION}/site-packages/salt/modules/omapi.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/openbsd_sysctl.py lib/python${MODPY_VERSION}/site-packages/salt/modules/openbsd_sysctl.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/openbsdpkg.py lib/python${MODPY_VERSION}/site-packages/salt/modules/openbsdpkg.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/openbsdrcctl.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/openbsdrcctl.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/openbsdrcctl_service.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/openbsdrcctl_service.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/openbsdservice.py lib/python${MODPY_VERSION}/site-packages/salt/modules/openbsdservice.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/openscap.py @@ -1151,8 +1225,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/osquery.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/out.py lib/python${MODPY_VERSION}/site-packages/salt/modules/out.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/pacman.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/pacman.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/pacmanpkg.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/pacmanpkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/pagerduty.py lib/python${MODPY_VERSION}/site-packages/salt/modules/pagerduty.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/pagerduty_util.py @@ -1163,14 +1237,16 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/panos.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/parallels.py lib/python${MODPY_VERSION}/site-packages/salt/modules/parallels.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/parted.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/parted.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/parted_partition.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/parted_partition.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/pcs.py lib/python${MODPY_VERSION}/site-packages/salt/modules/pcs.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/pdbedit.py lib/python${MODPY_VERSION}/site-packages/salt/modules/pdbedit.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/pecl.py lib/python${MODPY_VERSION}/site-packages/salt/modules/pecl.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/peeringdb.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/peeringdb.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/pf.py lib/python${MODPY_VERSION}/site-packages/salt/modules/pf.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/philips_hue.py @@ -1207,6 +1283,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/puppet.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/purefa.py lib/python${MODPY_VERSION}/site-packages/salt/modules/purefa.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/purefb.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/purefb.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/pushbullet.py lib/python${MODPY_VERSION}/site-packages/salt/modules/pushbullet.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/pushover_notify.py @@ -1241,8 +1319,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/redismod.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/reg.py lib/python${MODPY_VERSION}/site-packages/salt/modules/reg.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/rest_package.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/rest_package.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/rest_pkg.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/rest_pkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/rest_sample_utils.py lib/python${MODPY_VERSION}/site-packages/salt/modules/rest_sample_utils.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/rest_service.py @@ -1257,10 +1335,10 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/rh_service.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/riak.py lib/python${MODPY_VERSION}/site-packages/salt/modules/riak.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/rpm.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/rpm.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/rpmbuild.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/rpmbuild.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/rpm_lowpkg.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/rpm_lowpkg.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/rpmbuild_pkgbuild.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/rpmbuild_pkgbuild.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/rsync.py lib/python${MODPY_VERSION}/site-packages/salt/modules/rsync.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/runit.py @@ -1281,6 +1359,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/saltutil.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/schedule.py lib/python${MODPY_VERSION}/site-packages/salt/modules/schedule.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/scp_mod.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/scp_mod.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/scsi.py lib/python${MODPY_VERSION}/site-packages/salt/modules/scsi.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/sdb.py @@ -1315,8 +1395,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/smartos_vmadm.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/smbios.py lib/python${MODPY_VERSION}/site-packages/salt/modules/smbios.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/smf.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/smf.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/smf_service.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/smf_service.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/smtp.py lib/python${MODPY_VERSION}/site-packages/salt/modules/smtp.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/snapper.py @@ -1331,8 +1411,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/solaris_system.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/solaris_user.py lib/python${MODPY_VERSION}/site-packages/salt/modules/solaris_user.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/solarisips.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/solarisips.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/solarisipspkg.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/solarisipspkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/solarispkg.py lib/python${MODPY_VERSION}/site-packages/salt/modules/solarispkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/solr.py @@ -1347,8 +1427,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/sqlite3.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/ssh.py lib/python${MODPY_VERSION}/site-packages/salt/modules/ssh.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/ssh_package.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/ssh_package.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/ssh_pkg.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/ssh_pkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/ssh_service.py lib/python${MODPY_VERSION}/site-packages/salt/modules/ssh_service.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/state.py @@ -1381,8 +1461,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/system.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/system_profiler.py lib/python${MODPY_VERSION}/site-packages/salt/modules/system_profiler.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/systemd.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/systemd.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/systemd_service.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/systemd_service.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/telegram.py lib/python${MODPY_VERSION}/site-packages/salt/modules/telegram.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/telemetry.py @@ -1413,8 +1493,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/twilio_notify.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/udev.py lib/python${MODPY_VERSION}/site-packages/salt/modules/udev.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/upstart.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/upstart.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/upstart_service.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/upstart_service.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/uptime.py lib/python${MODPY_VERSION}/site-packages/salt/modules/uptime.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/useradd.py @@ -1443,6 +1523,10 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/vmctl.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/vsphere.py lib/python${MODPY_VERSION}/site-packages/salt/modules/vsphere.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/webutil.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/webutil.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/win_auditpol.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/win_auditpol.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/win_autoruns.py lib/python${MODPY_VERSION}/site-packages/salt/modules/win_autoruns.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/win_certutil.py @@ -1485,8 +1569,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/win_powercfg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/win_psget.py lib/python${MODPY_VERSION}/site-packages/salt/modules/win_psget.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/win_repo.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/win_repo.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/win_servermanager.py lib/python${MODPY_VERSION}/site-packages/salt/modules/win_servermanager.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/win_service.py @@ -1505,18 +1587,20 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/win_task.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/win_timezone.py lib/python${MODPY_VERSION}/site-packages/salt/modules/win_timezone.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/win_update.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/win_update.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/win_useradd.py lib/python${MODPY_VERSION}/site-packages/salt/modules/win_useradd.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/win_wua.py lib/python${MODPY_VERSION}/site-packages/salt/modules/win_wua.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/win_wusa.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/win_wusa.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/winrepo.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/winrepo.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/wordpress.py lib/python${MODPY_VERSION}/site-packages/salt/modules/wordpress.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/x509.py lib/python${MODPY_VERSION}/site-packages/salt/modules/x509.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/xapi.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/xapi.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/xapi_virt.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/xapi_virt.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/xbpspkg.py lib/python${MODPY_VERSION}/site-packages/salt/modules/xbpspkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/xfs.py @@ -1545,8 +1629,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/modules/zookeeper.pyc lib/python${MODPY_VERSION}/site-packages/salt/modules/zpool.py lib/python${MODPY_VERSION}/site-packages/salt/modules/zpool.pyc -lib/python${MODPY_VERSION}/site-packages/salt/modules/zypper.py -lib/python${MODPY_VERSION}/site-packages/salt/modules/zypper.pyc +lib/python${MODPY_VERSION}/site-packages/salt/modules/zypperpkg.py +lib/python${MODPY_VERSION}/site-packages/salt/modules/zypperpkg.pyc lib/python${MODPY_VERSION}/site-packages/salt/netapi/ lib/python${MODPY_VERSION}/site-packages/salt/netapi/__init__.py lib/python${MODPY_VERSION}/site-packages/salt/netapi/__init__.pyc @@ -1588,8 +1672,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/output/nested.pyc lib/python${MODPY_VERSION}/site-packages/salt/output/newline_values_only.py lib/python${MODPY_VERSION}/site-packages/salt/output/newline_values_only.pyc -lib/python${MODPY_VERSION}/site-packages/salt/output/no_out.py -lib/python${MODPY_VERSION}/site-packages/salt/output/no_out.pyc +lib/python${MODPY_VERSION}/site-packages/salt/output/no_out_quiet.py +lib/python${MODPY_VERSION}/site-packages/salt/output/no_out_quiet.pyc lib/python${MODPY_VERSION}/site-packages/salt/output/no_return.py lib/python${MODPY_VERSION}/site-packages/salt/output/no_return.pyc lib/python${MODPY_VERSION}/site-packages/salt/output/overstatestage.py @@ -1667,6 +1751,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/pillar/mysql.pyc lib/python${MODPY_VERSION}/site-packages/salt/pillar/nacl.py lib/python${MODPY_VERSION}/site-packages/salt/pillar/nacl.pyc +lib/python${MODPY_VERSION}/site-packages/salt/pillar/netbox.py +lib/python${MODPY_VERSION}/site-packages/salt/pillar/netbox.pyc lib/python${MODPY_VERSION}/site-packages/salt/pillar/neutron.py lib/python${MODPY_VERSION}/site-packages/salt/pillar/neutron.pyc lib/python${MODPY_VERSION}/site-packages/salt/pillar/nodegroups.py @@ -1709,15 +1795,24 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/pillar/virtkey.pyc lib/python${MODPY_VERSION}/site-packages/salt/pillar/vmware_pillar.py lib/python${MODPY_VERSION}/site-packages/salt/pillar/vmware_pillar.pyc +lib/python${MODPY_VERSION}/site-packages/salt/platform/ +lib/python${MODPY_VERSION}/site-packages/salt/platform/__init__.py +lib/python${MODPY_VERSION}/site-packages/salt/platform/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/salt/platform/win.py +lib/python${MODPY_VERSION}/site-packages/salt/platform/win.pyc lib/python${MODPY_VERSION}/site-packages/salt/proxy/ lib/python${MODPY_VERSION}/site-packages/salt/proxy/__init__.py lib/python${MODPY_VERSION}/site-packages/salt/proxy/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/salt/proxy/arista_pyeapi.py +lib/python${MODPY_VERSION}/site-packages/salt/proxy/arista_pyeapi.pyc lib/python${MODPY_VERSION}/site-packages/salt/proxy/chronos.py lib/python${MODPY_VERSION}/site-packages/salt/proxy/chronos.pyc lib/python${MODPY_VERSION}/site-packages/salt/proxy/cimc.py lib/python${MODPY_VERSION}/site-packages/salt/proxy/cimc.pyc lib/python${MODPY_VERSION}/site-packages/salt/proxy/cisconso.py lib/python${MODPY_VERSION}/site-packages/salt/proxy/cisconso.pyc +lib/python${MODPY_VERSION}/site-packages/salt/proxy/docker.py +lib/python${MODPY_VERSION}/site-packages/salt/proxy/docker.pyc lib/python${MODPY_VERSION}/site-packages/salt/proxy/dummy.py lib/python${MODPY_VERSION}/site-packages/salt/proxy/dummy.pyc lib/python${MODPY_VERSION}/site-packages/salt/proxy/esxcluster.py @@ -1736,8 +1831,12 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/proxy/marathon.pyc lib/python${MODPY_VERSION}/site-packages/salt/proxy/napalm.py lib/python${MODPY_VERSION}/site-packages/salt/proxy/napalm.pyc +lib/python${MODPY_VERSION}/site-packages/salt/proxy/netmiko_px.py +lib/python${MODPY_VERSION}/site-packages/salt/proxy/netmiko_px.pyc lib/python${MODPY_VERSION}/site-packages/salt/proxy/nxos.py lib/python${MODPY_VERSION}/site-packages/salt/proxy/nxos.pyc +lib/python${MODPY_VERSION}/site-packages/salt/proxy/nxos_api.py +lib/python${MODPY_VERSION}/site-packages/salt/proxy/nxos_api.pyc lib/python${MODPY_VERSION}/site-packages/salt/proxy/panos.py lib/python${MODPY_VERSION}/site-packages/salt/proxy/panos.pyc lib/python${MODPY_VERSION}/site-packages/salt/proxy/philips_hue.py @@ -1758,6 +1857,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/renderers/ lib/python${MODPY_VERSION}/site-packages/salt/renderers/__init__.py lib/python${MODPY_VERSION}/site-packages/salt/renderers/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/salt/renderers/aws_kms.py +lib/python${MODPY_VERSION}/site-packages/salt/renderers/aws_kms.pyc lib/python${MODPY_VERSION}/site-packages/salt/renderers/cheetah.py lib/python${MODPY_VERSION}/site-packages/salt/renderers/cheetah.pyc lib/python${MODPY_VERSION}/site-packages/salt/renderers/dson.py @@ -1841,8 +1942,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/returners/multi_returner.pyc lib/python${MODPY_VERSION}/site-packages/salt/returners/mysql.py lib/python${MODPY_VERSION}/site-packages/salt/returners/mysql.pyc -lib/python${MODPY_VERSION}/site-packages/salt/returners/nagios_return.py -lib/python${MODPY_VERSION}/site-packages/salt/returners/nagios_return.pyc +lib/python${MODPY_VERSION}/site-packages/salt/returners/nagios_nrdp_return.py +lib/python${MODPY_VERSION}/site-packages/salt/returners/nagios_nrdp_return.pyc lib/python${MODPY_VERSION}/site-packages/salt/returners/odbc.py lib/python${MODPY_VERSION}/site-packages/salt/returners/odbc.pyc lib/python${MODPY_VERSION}/site-packages/salt/returners/pgjsonb.py @@ -1896,6 +1997,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/roster/scan.pyc lib/python${MODPY_VERSION}/site-packages/salt/roster/sshconfig.py lib/python${MODPY_VERSION}/site-packages/salt/roster/sshconfig.pyc +lib/python${MODPY_VERSION}/site-packages/salt/roster/terraform.py +lib/python${MODPY_VERSION}/site-packages/salt/roster/terraform.pyc lib/python${MODPY_VERSION}/site-packages/salt/runner.py lib/python${MODPY_VERSION}/site-packages/salt/runner.pyc lib/python${MODPY_VERSION}/site-packages/salt/runners/ @@ -2012,6 +2115,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/sdb/keyring_db.pyc lib/python${MODPY_VERSION}/site-packages/salt/sdb/memcached.py lib/python${MODPY_VERSION}/site-packages/salt/sdb/memcached.pyc +lib/python${MODPY_VERSION}/site-packages/salt/sdb/redis_sdb.py +lib/python${MODPY_VERSION}/site-packages/salt/sdb/redis_sdb.pyc lib/python${MODPY_VERSION}/site-packages/salt/sdb/rest.py lib/python${MODPY_VERSION}/site-packages/salt/sdb/rest.pyc lib/python${MODPY_VERSION}/site-packages/salt/sdb/sqlite3.py @@ -2085,6 +2190,12 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/states/augeas.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/aws_sqs.py lib/python${MODPY_VERSION}/site-packages/salt/states/aws_sqs.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/azurearm_compute.py +lib/python${MODPY_VERSION}/site-packages/salt/states/azurearm_compute.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/azurearm_network.py +lib/python${MODPY_VERSION}/site-packages/salt/states/azurearm_network.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/azurearm_resource.py +lib/python${MODPY_VERSION}/site-packages/salt/states/azurearm_resource.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/beacon.py lib/python${MODPY_VERSION}/site-packages/salt/states/beacon.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/bigip.py @@ -2195,8 +2306,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/states/dellchassis.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/disk.py lib/python${MODPY_VERSION}/site-packages/salt/states/disk.pyc -lib/python${MODPY_VERSION}/site-packages/salt/states/docker.py -lib/python${MODPY_VERSION}/site-packages/salt/states/docker.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/docker_container.py lib/python${MODPY_VERSION}/site-packages/salt/states/docker_container.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/docker_image.py @@ -2285,8 +2394,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/states/hipchat.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/host.py lib/python${MODPY_VERSION}/site-packages/salt/states/host.pyc -lib/python${MODPY_VERSION}/site-packages/salt/states/htpasswd.py -lib/python${MODPY_VERSION}/site-packages/salt/states/htpasswd.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/http.py lib/python${MODPY_VERSION}/site-packages/salt/states/http.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/icinga2.py @@ -2329,8 +2436,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/states/jenkins.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/junos.py lib/python${MODPY_VERSION}/site-packages/salt/states/junos.pyc -lib/python${MODPY_VERSION}/site-packages/salt/states/k8s.py -lib/python${MODPY_VERSION}/site-packages/salt/states/k8s.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/kapacitor.py lib/python${MODPY_VERSION}/site-packages/salt/states/kapacitor.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/kernelpkg.py @@ -2387,22 +2492,30 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/states/lvs_service.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/lxc.py lib/python${MODPY_VERSION}/site-packages/salt/states/lxc.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/lxd.py +lib/python${MODPY_VERSION}/site-packages/salt/states/lxd.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/lxd_container.py +lib/python${MODPY_VERSION}/site-packages/salt/states/lxd_container.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/lxd_image.py +lib/python${MODPY_VERSION}/site-packages/salt/states/lxd_image.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/lxd_profile.py +lib/python${MODPY_VERSION}/site-packages/salt/states/lxd_profile.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/mac_assistive.py lib/python${MODPY_VERSION}/site-packages/salt/states/mac_assistive.pyc -lib/python${MODPY_VERSION}/site-packages/salt/states/mac_defaults.py -lib/python${MODPY_VERSION}/site-packages/salt/states/mac_defaults.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/mac_keychain.py lib/python${MODPY_VERSION}/site-packages/salt/states/mac_keychain.pyc -lib/python${MODPY_VERSION}/site-packages/salt/states/mac_package.py -lib/python${MODPY_VERSION}/site-packages/salt/states/mac_package.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/mac_xattr.py lib/python${MODPY_VERSION}/site-packages/salt/states/mac_xattr.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/macdefaults.py +lib/python${MODPY_VERSION}/site-packages/salt/states/macdefaults.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/macpackage.py +lib/python${MODPY_VERSION}/site-packages/salt/states/macpackage.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/makeconf.py lib/python${MODPY_VERSION}/site-packages/salt/states/makeconf.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/marathon_app.py lib/python${MODPY_VERSION}/site-packages/salt/states/marathon_app.pyc -lib/python${MODPY_VERSION}/site-packages/salt/states/mdadm.py -lib/python${MODPY_VERSION}/site-packages/salt/states/mdadm.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/mdadm_raid.py +lib/python${MODPY_VERSION}/site-packages/salt/states/mdadm_raid.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/memcached.py lib/python${MODPY_VERSION}/site-packages/salt/states/memcached.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/modjk.py @@ -2437,6 +2550,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/states/mysql_query.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/mysql_user.py lib/python${MODPY_VERSION}/site-packages/salt/states/mysql_user.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/net_napalm_yang.py +lib/python${MODPY_VERSION}/site-packages/salt/states/net_napalm_yang.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/netacl.py lib/python${MODPY_VERSION}/site-packages/salt/states/netacl.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/netconfig.py @@ -2449,8 +2564,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/states/netusers.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/network.py lib/python${MODPY_VERSION}/site-packages/salt/states/network.pyc -lib/python${MODPY_VERSION}/site-packages/salt/states/netyang.py -lib/python${MODPY_VERSION}/site-packages/salt/states/netyang.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/neutron_network.py lib/python${MODPY_VERSION}/site-packages/salt/states/neutron_network.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/neutron_secgroup.py @@ -2653,6 +2766,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/states/virt.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/virtualenv_mod.py lib/python${MODPY_VERSION}/site-packages/salt/states/virtualenv_mod.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/webutil.py +lib/python${MODPY_VERSION}/site-packages/salt/states/webutil.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/win_certutil.py lib/python${MODPY_VERSION}/site-packages/salt/states/win_certutil.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/win_dacl.py @@ -2685,10 +2800,10 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/states/win_snmp.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/win_system.py lib/python${MODPY_VERSION}/site-packages/salt/states/win_system.pyc -lib/python${MODPY_VERSION}/site-packages/salt/states/win_update.py -lib/python${MODPY_VERSION}/site-packages/salt/states/win_update.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/win_wua.py lib/python${MODPY_VERSION}/site-packages/salt/states/win_wua.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/win_wusa.py +lib/python${MODPY_VERSION}/site-packages/salt/states/win_wusa.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/winrepo.py lib/python${MODPY_VERSION}/site-packages/salt/states/winrepo.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/wordpress.py @@ -2697,18 +2812,24 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/states/x509.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/xmpp.py lib/python${MODPY_VERSION}/site-packages/salt/states/xmpp.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_action.py +lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_action.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_host.py lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_host.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_hostgroup.py lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_hostgroup.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_mediatype.py lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_mediatype.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_template.py +lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_template.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_user.py lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_user.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_usergroup.py lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_usergroup.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_usermacro.py lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_usermacro.pyc +lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_valuemap.py +lib/python${MODPY_VERSION}/site-packages/salt/states/zabbix_valuemap.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/zcbuildout.py lib/python${MODPY_VERSION}/site-packages/salt/states/zcbuildout.pyc lib/python${MODPY_VERSION}/site-packages/salt/states/zenoss.py @@ -2753,6 +2874,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/templates/rh_ip/route_eth.jinja lib/python${MODPY_VERSION}/site-packages/salt/templates/virt/ lib/python${MODPY_VERSION}/site-packages/salt/templates/virt/libvirt_domain.jinja +lib/python${MODPY_VERSION}/site-packages/salt/templates/virt/libvirt_network.jinja +lib/python${MODPY_VERSION}/site-packages/salt/templates/virt/libvirt_pool.jinja lib/python${MODPY_VERSION}/site-packages/salt/templates/virt/libvirt_volume.jinja lib/python${MODPY_VERSION}/site-packages/salt/textformat.py lib/python${MODPY_VERSION}/site-packages/salt/textformat.pyc @@ -2799,8 +2922,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/tops/reclass_adapter.pyc lib/python${MODPY_VERSION}/site-packages/salt/tops/saltclass.py lib/python${MODPY_VERSION}/site-packages/salt/tops/saltclass.pyc -lib/python${MODPY_VERSION}/site-packages/salt/tops/varstack.py -lib/python${MODPY_VERSION}/site-packages/salt/tops/varstack.pyc +lib/python${MODPY_VERSION}/site-packages/salt/tops/varstack_top.py +lib/python${MODPY_VERSION}/site-packages/salt/tops/varstack_top.pyc lib/python${MODPY_VERSION}/site-packages/salt/transport/ lib/python${MODPY_VERSION}/site-packages/salt/transport/__init__.py lib/python${MODPY_VERSION}/site-packages/salt/transport/__init__.pyc @@ -2838,6 +2961,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/utils/atomicfile.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/aws.py lib/python${MODPY_VERSION}/site-packages/salt/utils/aws.pyc +lib/python${MODPY_VERSION}/site-packages/salt/utils/azurearm.py +lib/python${MODPY_VERSION}/site-packages/salt/utils/azurearm.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/boto3mod.py lib/python${MODPY_VERSION}/site-packages/salt/utils/boto3mod.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/boto_elb_tag.py @@ -2860,6 +2985,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/utils/context.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/crypt.py lib/python${MODPY_VERSION}/site-packages/salt/utils/crypt.pyc +lib/python${MODPY_VERSION}/site-packages/salt/utils/ctx.py +lib/python${MODPY_VERSION}/site-packages/salt/utils/ctx.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/data.py lib/python${MODPY_VERSION}/site-packages/salt/utils/data.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/dateutils.py @@ -2899,6 +3026,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/translate/helpers.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/translate/network.py lib/python${MODPY_VERSION}/site-packages/salt/utils/docker/translate/network.pyc +lib/python${MODPY_VERSION}/site-packages/salt/utils/environment.py +lib/python${MODPY_VERSION}/site-packages/salt/utils/environment.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/error.py lib/python${MODPY_VERSION}/site-packages/salt/utils/error.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/etcd_util.py @@ -2931,6 +3060,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/utils/http.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/iam.py lib/python${MODPY_VERSION}/site-packages/salt/utils/iam.pyc +lib/python${MODPY_VERSION}/site-packages/salt/utils/icinga2.py +lib/python${MODPY_VERSION}/site-packages/salt/utils/icinga2.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/immutabletypes.py lib/python${MODPY_VERSION}/site-packages/salt/utils/immutabletypes.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/itertools.py @@ -2973,6 +3104,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/utils/mount.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/msazure.py lib/python${MODPY_VERSION}/site-packages/salt/utils/msazure.pyc +lib/python${MODPY_VERSION}/site-packages/salt/utils/nacl.py +lib/python${MODPY_VERSION}/site-packages/salt/utils/nacl.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/namecheap.py lib/python${MODPY_VERSION}/site-packages/salt/utils/namecheap.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/napalm.py @@ -2981,6 +3114,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/utils/nb_popen.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/network.py lib/python${MODPY_VERSION}/site-packages/salt/utils/network.pyc +lib/python${MODPY_VERSION}/site-packages/salt/utils/nxos_api.py +lib/python${MODPY_VERSION}/site-packages/salt/utils/nxos_api.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/odict.py lib/python${MODPY_VERSION}/site-packages/salt/utils/odict.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/openstack/ @@ -3046,6 +3181,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/utils/reactor.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/reclass.py lib/python${MODPY_VERSION}/site-packages/salt/utils/reclass.pyc +lib/python${MODPY_VERSION}/site-packages/salt/utils/roster_matcher.py +lib/python${MODPY_VERSION}/site-packages/salt/utils/roster_matcher.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/rsax931.py lib/python${MODPY_VERSION}/site-packages/salt/utils/rsax931.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/s3.py @@ -3086,6 +3223,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/utils/timed_subprocess.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/timeout.py lib/python${MODPY_VERSION}/site-packages/salt/utils/timeout.pyc +lib/python${MODPY_VERSION}/site-packages/salt/utils/timeutil.py +lib/python${MODPY_VERSION}/site-packages/salt/utils/timeutil.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/url.py lib/python${MODPY_VERSION}/site-packages/salt/utils/url.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/user.py @@ -3123,8 +3262,14 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/utils/win_dacl.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/win_functions.py lib/python${MODPY_VERSION}/site-packages/salt/utils/win_functions.pyc +lib/python${MODPY_VERSION}/site-packages/salt/utils/win_lgpo_auditpol.py +lib/python${MODPY_VERSION}/site-packages/salt/utils/win_lgpo_auditpol.pyc +lib/python${MODPY_VERSION}/site-packages/salt/utils/win_lgpo_netsh.py +lib/python${MODPY_VERSION}/site-packages/salt/utils/win_lgpo_netsh.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/win_osinfo.py lib/python${MODPY_VERSION}/site-packages/salt/utils/win_osinfo.pyc +lib/python${MODPY_VERSION}/site-packages/salt/utils/win_pdh.py +lib/python${MODPY_VERSION}/site-packages/salt/utils/win_pdh.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/win_reg.py lib/python${MODPY_VERSION}/site-packages/salt/utils/win_reg.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/win_runas.py @@ -3145,6 +3290,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/salt/utils/yamlencoding.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/yamlloader.py lib/python${MODPY_VERSION}/site-packages/salt/utils/yamlloader.pyc +lib/python${MODPY_VERSION}/site-packages/salt/utils/yamlloader_old.py +lib/python${MODPY_VERSION}/site-packages/salt/utils/yamlloader_old.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/yast.py lib/python${MODPY_VERSION}/site-packages/salt/utils/yast.pyc lib/python${MODPY_VERSION}/site-packages/salt/utils/zeromq.py
