Merge branch '2018.3' into 2018.3

This commit is contained in:
Assaf Shapira 2019-02-20 12:07:24 +02:00 committed by GitHub
commit 895b97a295
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
156 changed files with 519 additions and 398 deletions

View File

@ -29,7 +29,7 @@ execution modules
apache
apcups
apf
apk
apkpkg
aptpkg
archive
artifactory
@ -41,7 +41,7 @@ execution modules
bcache
beacons
bigip
bluez
bluez_bluetooth
boto3_elasticache
boto3_route53
boto_apigateway
@ -104,7 +104,7 @@ execution modules
ddns
deb_apache
deb_postgres
debbuild
debuild_pkgbuild
debconfmod
debian_ip
debian_service
@ -117,13 +117,13 @@ execution modules
dnsutil
dockercompose
dockermod
dpkg
dpkg_lowpkg
drac
dracr
drbd
dummyproxy_package
dummyproxy_pkg
dummyproxy_service
ebuild
ebuildpkg
eix
elasticsearch
environ
@ -165,14 +165,13 @@ execution modules
hg
hipchat
hosts
htpasswd
http
ifttt
ilo
icinga2
incron
influx
influx08
influxdbmod
influxdb08mod
infoblox
ini_manage
inspectlib
@ -204,7 +203,7 @@ execution modules
keystoneng
kmod
kubernetes
launchctl
launchctl_service
layman
ldap3
ldapmod
@ -224,14 +223,14 @@ execution modules
lvs
lxc
mac_assistive
mac_brew
mac_defaults
mac_brew_pkg
macdefaults
mac_desktop
mac_group
mac_keychain
mac_package
macpackage
mac_pkgutil
mac_ports
mac_portspkg
mac_power
mac_service
mac_shadow
@ -246,7 +245,7 @@ execution modules
marathon
match
mattermost
mdadm
mdadm_raid
mdata
memcached
mine
@ -264,13 +263,13 @@ execution modules
nacl
nagios
nagios_rpc
namecheap_dns
namecheap_domains_dns
namecheap_domains
namecheap_ns
namecheap_domains_ns
namecheap_ssl
namecheap_users
napalm
napalm_acl
napalm_netacl
napalm_bgp
napalm_network
napalm_ntp
@ -299,7 +298,7 @@ execution modules
omapi
openbsd_sysctl
openbsdpkg
openbsdrcctl
openbsdrcctl_service
openbsdservice
openscap
openstack_config
@ -310,12 +309,12 @@ execution modules
oracle
osquery
out
pacman
pacmanpkg
pagerduty
pagerduty_util
pam
parallels
parted
parted_partition
pcs
pdbedit
pecl
@ -353,7 +352,7 @@ execution modules
rdp
redismod
reg
rest_package
rest_pkg
rest_sample_utils
rest_service
restartcheck
@ -361,8 +360,8 @@ execution modules
rh_ip
rh_service
riak
rpm
rpmbuild
rpm_lowpkg
rpmbuild_pkgbuild
rsync
runit
rvm
@ -390,14 +389,14 @@ execution modules
smartos_virt
smartos_vmadm
smbios
smf
smf_service
smtp
solaris_fmadm
solaris_group
solaris_shadow
solaris_system
solaris_user
solarisips
solarisipspkg
solarispkg
solr
solrcloud
@ -405,7 +404,7 @@ execution modules
splunk_search
sqlite3
ssh
ssh_package
ssh_pkg
ssh_service
snapper
state
@ -423,7 +422,7 @@ execution modules
sysrc
system
system_profiler
systemd
systemd_service
telegram
telemetry
temp
@ -439,7 +438,7 @@ execution modules
tuned
twilio_notify
udev
upstart
upstart_service
uptime
useradd
uwsgi
@ -452,6 +451,7 @@ execution modules
virt
virtualenv_mod
vsphere
webutil
win_autoruns
win_certutil
win_dacl
@ -473,7 +473,7 @@ execution modules
win_pki
win_powercfg
win_psget
win_repo
winrepo
win_servermanager
win_service
win_shadow
@ -487,7 +487,7 @@ execution modules
win_useradd
win_wua
x509
xapi
xapi_virt
xbpspkg
xfs
xmpp
@ -502,4 +502,4 @@ execution modules
zonecfg
zookeeper
zpool
zypper
zypperpkg

View File

@ -1,6 +0,0 @@
salt.modules.apk module
=======================
.. automodule:: salt.modules.apk
:members:
:undoc-members:

View File

@ -0,0 +1,7 @@
===================
salt.modules.apkpkg
===================
.. automodule:: salt.modules.apkpkg
:members:
:undoc-members:

View File

@ -1,6 +0,0 @@
==================
salt.modules.bluez
==================
.. automodule:: salt.modules.bluez
:members:

View File

@ -0,0 +1,6 @@
============================
salt.modules.bluez_bluetooth
============================
.. automodule:: salt.modules.bluez_bluetooth
:members:

View File

@ -1,6 +0,0 @@
=====================
salt.modules.debbuild
=====================
.. automodule:: salt.modules.debbuild
:members:

View File

@ -1,7 +1,6 @@
==============================
salt.modules.napalm_acl module
salt.modules.debuild_pkgbuild
==============================
.. automodule:: salt.modules.napalm_acl
.. automodule:: salt.modules.debuild_pkgbuild
:members:

View File

@ -1,6 +0,0 @@
=================
salt.modules.dpkg
=================
.. automodule:: salt.modules.dpkg
:members:

View File

@ -0,0 +1,6 @@
========================
salt.modules.dpkg_lowpkg
========================
.. automodule:: salt.modules.dpkg_lowpkg
:members:

View File

@ -1,6 +0,0 @@
salt.modules.dummyproxy_package module
======================================
.. automodule:: salt.modules.dummyproxy_package
:members:
:undoc-members:

View File

@ -0,0 +1,7 @@
==================================
salt.modules.dummyproxy_pkg module
==================================
.. automodule:: salt.modules.dummyproxy_pkg
:members:
:undoc-members:

View File

@ -1,7 +0,0 @@
===================
salt.modules.ebuild
===================
.. automodule:: salt.modules.ebuild
:members:
:exclude-members: available_version

View File

@ -0,0 +1,7 @@
======================
salt.modules.ebuildpkg
======================
.. automodule:: salt.modules.ebuildpkg
:members:
:exclude-members: available_version

View File

@ -1,6 +0,0 @@
=====================
salt.modules.htpasswd
=====================
.. automodule:: salt.modules.htpasswd
:members:

View File

@ -1,6 +0,0 @@
===================
salt.modules.influx
===================
.. automodule:: salt.modules.influx
:members:

View File

@ -1,6 +0,0 @@
salt.modules.influx08 module
============================
.. automodule:: salt.modules.influx08
:members:
:undoc-members:

View File

@ -0,0 +1,7 @@
==========================
salt.modules.influxdb08mod
==========================
.. automodule:: salt.modules.influxdb08mod
:members:
:undoc-members:

View File

@ -0,0 +1,6 @@
========================
salt.modules.influxdbmod
========================
.. automodule:: salt.modules.influxdbmod
:members:

View File

@ -1,6 +0,0 @@
======================
salt.modules.launchctl
======================
.. automodule:: salt.modules.launchctl
:members:

View File

@ -0,0 +1,6 @@
==============================
salt.modules.launchctl_service
==============================
.. automodule:: salt.modules.launchctl_service
:members:

View File

@ -1,5 +0,0 @@
salt.modules.mac_brew module
============================
.. automodule:: salt.modules.mac_brew
:members:

View File

@ -0,0 +1,6 @@
=========================
salt.modules.mac_brew_pkg
=========================
.. automodule:: salt.modules.mac_brew_pkg
:members:

View File

@ -1,5 +0,0 @@
salt.modules.mac_defaults module
================================
.. automodule:: salt.modules.mac_defaults
:members:

View File

@ -1,5 +0,0 @@
salt.modules.mac_package module
===============================
.. automodule:: salt.modules.mac_package
:members:

View File

@ -1,5 +0,0 @@
salt.modules.mac_ports module
=============================
.. automodule:: salt.modules.mac_ports
:members:

View File

@ -0,0 +1,6 @@
=========================
salt.modules.mac_portspkg
=========================
.. automodule:: salt.modules.mac_portspkg
:members:

View File

@ -0,0 +1,6 @@
========================
salt.modules.macdefaults
========================
.. automodule:: salt.modules.macdefaults
:members:

View File

@ -0,0 +1,6 @@
=======================
salt.modules.macpackage
=======================
.. automodule:: salt.modules.macpackage
:members:

View File

@ -1,6 +0,0 @@
==================
salt.modules.mdadm
==================
.. automodule:: salt.modules.mdadm
:members:

View File

@ -0,0 +1,6 @@
=======================
salt.modules.mdadm_raid
=======================
.. automodule:: salt.modules.mdadm_raid
:members:

View File

@ -1,6 +0,0 @@
salt.modules.namecheap_dns module
=================================
.. automodule:: salt.modules.namecheap_dns
:members:
:undoc-members:

View File

@ -0,0 +1,7 @@
==================================
salt.modules.namecheap_domains_dns
==================================
.. automodule:: salt.modules.namecheap_domains_dns
:members:
:undoc-members:

View File

@ -0,0 +1,7 @@
=================================
salt.modules.namecheap_domains_ns
=================================
.. automodule:: salt.modules.namecheap_domains_ns
:members:
:undoc-members:

View File

@ -1,6 +0,0 @@
salt.modules.namecheap_ns module
================================
.. automodule:: salt.modules.namecheap_ns
:members:
:undoc-members:

View File

@ -0,0 +1,7 @@
==========================
salt.modules.napalm_netacl
==========================
.. automodule:: salt.modules.napalm_netacl
:members:

View File

@ -1,6 +0,0 @@
=========================
salt.modules.openbsdrcctl
=========================
.. automodule:: salt.modules.openbsdrcctl
:members:

View File

@ -0,0 +1,6 @@
====================================
salt.modules.openbsdrcctl_service.py
====================================
.. automodule:: salt.modules.openbsdrcctl_service
:members:

View File

@ -1,7 +0,0 @@
===================
salt.modules.pacman
===================
.. automodule:: salt.modules.pacman
:members:
:exclude-members: available_version

View File

@ -0,0 +1,7 @@
======================
salt.modules.pacmanpkg
======================
.. automodule:: salt.modules.pacmanpkg
:members:
:exclude-members: available_version

View File

@ -1,6 +0,0 @@
===================
salt.modules.parted
===================
.. automodule:: salt.modules.parted
:members:

View File

@ -0,0 +1,6 @@
=============================
salt.modules.parted_partition
=============================
.. automodule:: salt.modules.parted_partition
:members:

View File

@ -1,6 +0,0 @@
=========================
salt.modules.rest_package
=========================
.. automodule:: salt.modules.rest_package
:members:

View File

@ -0,0 +1,6 @@
=====================
salt.modules.rest_pkg
=====================
.. automodule:: salt.modules.rest_pkg
:members:

View File

@ -1,6 +0,0 @@
================
salt.modules.rpm
================
.. automodule:: salt.modules.rpm
:members:

View File

@ -0,0 +1,6 @@
=======================
salt.modules.rpm_lowpkg
=======================
.. automodule:: salt.modules.rpm_lowpkg
:members:

View File

@ -1,6 +0,0 @@
=====================
salt.modules.rpmbuild
=====================
.. automodule:: salt.modules.rpmbuild
:members:

View File

@ -0,0 +1,6 @@
==============================
salt.modules.rpmbuild_pkgbuild
==============================
.. automodule:: salt.modules.rpmbuild_pkgbuild
:members:

View File

@ -1,6 +0,0 @@
================
salt.modules.smf
================
.. automodule:: salt.modules.smf
:members:

View File

@ -0,0 +1,6 @@
========================
salt.modules.smf_service
========================
.. automodule:: salt.modules.smf_service
:members:

View File

@ -1,6 +0,0 @@
=======================
salt.modules.solarisips
=======================
.. automodule:: salt.modules.solarisips
:members:

View File

@ -0,0 +1,6 @@
==========================
salt.modules.solarisipspkg
==========================
.. automodule:: salt.modules.solarisipspkg
:members:

View File

@ -1,5 +0,0 @@
salt.modules.ssh_package module
===============================
.. automodule:: salt.modules.ssh_package
:members:

View File

@ -0,0 +1,5 @@
salt.modules.ssh_pkg
====================
.. automodule:: salt.modules.ssh_pkg
:members:

View File

@ -1,6 +0,0 @@
====================
salt.modules.systemd
====================
.. automodule:: salt.modules.systemd
:members:

View File

@ -0,0 +1,6 @@
============================
salt.modules.systemd_service
============================
.. automodule:: salt.modules.systemd_service
:members:

View File

@ -1,6 +0,0 @@
====================
salt.modules.upstart
====================
.. automodule:: salt.modules.upstart
:members:

View File

@ -0,0 +1,6 @@
============================
salt.modules.upstart_service
============================
.. automodule:: salt.modules.upstart_service
:members:

View File

@ -0,0 +1,6 @@
====================
salt.modules.webutil
====================
.. automodule:: salt.modules.webutil
:members:

View File

@ -1,6 +0,0 @@
=====================
salt.modules.win_repo
=====================
.. automodule:: salt.modules.win_repo
:members:

View File

@ -0,0 +1,6 @@
====================
salt.modules.winrepo
====================
.. automodule:: salt.modules.winrepo
:members:

View File

@ -1,6 +0,0 @@
=================
salt.modules.xapi
=================
.. automodule:: salt.modules.xapi
:members:

View File

@ -0,0 +1,6 @@
======================
salt.modules.xapi_virt
======================
.. automodule:: salt.modules.xapi_virt
:members:

View File

@ -1,7 +0,0 @@
===================
salt.modules.zypper
===================
.. automodule:: salt.modules.zypper
:members:
:exclude-members: list_updates, available_version

View File

@ -0,0 +1,7 @@
======================
salt.modules.zypperpkg
======================
.. automodule:: salt.modules.zypperpkg
:members:
:exclude-members: list_updates, available_version

View File

@ -17,7 +17,7 @@ Follow one of the below links for further information and examples
key
nested
newline_values_only
no_out
no_out_quiet
no_return
overstatestage
pony

View File

@ -1,6 +0,0 @@
==================
salt.output.no_out
==================
.. automodule:: salt.output.no_out
:members:

View File

@ -0,0 +1,6 @@
========================
salt.output.no_out_quiet
========================
.. automodule:: salt.output.no_out_quiet
:members:

View File

@ -31,7 +31,7 @@ returner modules
mongo_return
multi_returner
mysql
nagios_return
nagios_nrdp_return
odbc
pgjsonb
postgres

View File

@ -0,0 +1,6 @@
=================================
salt.returners.nagios_nrdp_return
=================================
.. automodule:: salt.returners.nagios_nrdp_return
:members:

View File

@ -1,6 +0,0 @@
============================
salt.returners.nagios_return
============================
.. automodule:: salt.returners.nagios_return
:members:

View File

@ -114,7 +114,6 @@ state modules
hg
hipchat
host
htpasswd
http
icinga2
ifttt
@ -166,13 +165,13 @@ state modules
lvs_service
lxc
mac_assistive
mac_defaults
macdefaults
mac_keychain
mac_package
macpackage
mac_xattr
makeconf
marathon_app
mdadm
mdadm_raid
memcached
modjk
modjk_worker
@ -192,7 +191,7 @@ state modules
netsnmp
netusers
network
netyang
net_napalm_yang
neutron_network
neutron_secgroup
neutron_secgroup_rule
@ -291,6 +290,7 @@ state modules
victorops
virt
virtualenv_mod
webutil
win_certutil
win_dacl
win_dism

View File

@ -1,6 +0,0 @@
====================
salt.states.htpasswd
====================
.. automodule:: salt.states.htpasswd
:members:

View File

@ -1,5 +0,0 @@
salt.states.mac_defaults module
===============================
.. automodule:: salt.states.mac_defaults
:members:

View File

@ -1,5 +0,0 @@
salt.states.mac_package module
==============================
.. automodule:: salt.states.mac_package
:members:

View File

@ -0,0 +1,6 @@
=======================
salt.states.macdefaults
=======================
.. automodule:: salt.states.macdefaults
:members:

View File

@ -0,0 +1,6 @@
======================
salt.states.macpackage
======================
.. automodule:: salt.states.macpackage
:members:

View File

@ -1,6 +0,0 @@
=================
salt.states.mdadm
=================
.. automodule:: salt.states.mdadm
:members:

View File

@ -0,0 +1,6 @@
======================
salt.states.mdadm_raid
======================
.. automodule:: salt.states.mdadm_raid
:members:

View File

@ -0,0 +1,7 @@
===========================
salt.states.net_napalm_yang
===========================
.. automodule:: salt.states.net_napalm_yang
:members:

View File

@ -1,7 +0,0 @@
===================
salt.states.netyang
===================
.. automodule:: salt.states.netyang
:members:

View File

@ -0,0 +1,6 @@
===================
salt.states.webutil
===================
.. automodule:: salt.states.webutil
:members:

View File

@ -3,7 +3,7 @@
Openstack Cloud Driver
======================
:depends: `shade <https://pypi.python.org/pypi/shade>`_
:depends: `shade>=1.19.0 <https://pypi.python.org/pypi/shade>`_
OpenStack is an open source project that is in use by a number a cloud
providers, each of which have their own ways of using it.
@ -218,7 +218,7 @@ import pprint
import socket
# Import Salt Libs
import salt.utils.json
import salt.utils.versions
import salt.config as config
from salt.ext import six
from salt.exceptions import (
@ -230,12 +230,16 @@ from salt.exceptions import (
# Import 3rd-Party Libs
try:
import shade
import shade.openstackcloud
import shade.exc
import os_client_config
HAS_SHADE = True
HAS_SHADE = (
salt.utils.versions._LooseVersion(shade.__version__) >= salt.utils.versions._LooseVersion('1.19.0'),
'Please install newer version of shade: >= 1.19.0'
)
except ImportError:
HAS_SHADE = False
HAS_SHADE = (False, 'Install pypi module shade >= 1.19.0')
log = logging.getLogger(__name__)
__virtualname__ = 'openstack'
@ -248,7 +252,7 @@ def __virtual__():
if get_configured_provider() is False:
return False
if get_dependencies() is False:
return False
return HAS_SHADE
return __virtualname__
@ -270,8 +274,8 @@ def get_dependencies():
Warn if dependencies aren't met.
'''
deps = {
'shade': HAS_SHADE,
'os_client_config': HAS_SHADE,
'shade': shade[0],
'os_client_config': shade[0],
}
return config.check_driver_dependencies(
__virtualname__,
@ -844,7 +848,7 @@ def call(conn=None, call=None, kwargs=None):
func = kwargs.pop('func')
for key, value in kwargs.items():
try:
kwargs[key] = salt.utils.json.loads(value)
kwargs[key] = __utils__['json.loads'](value)
except ValueError:
continue
try:

View File

@ -23,7 +23,8 @@ from salt.exceptions import CommandNotFoundError
log = logging.getLogger(__name__)
# Define the module's virtual name
__virtualname__ = 'freebsd-update'
__virtualname__ = 'freebsd_update'
__virtual_aliases__ = ('freebsd-update',)
def __virtual__():

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