mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #51776 from garethgreenaway/merge-2018.3
[2019.2] Merge forward from 2018.3 to 2019.2
This commit is contained in:
Daniel Wozniak
GitHub
commit
45425a45c9
173 changed files with 1278 additions and 734 deletions
|
|
@ -29,7 +29,7 @@ execution modules
|
|||
apache
|
||||
apcups
|
||||
apf
|
||||
apk
|
||||
apkpkg
|
||||
aptpkg
|
||||
archive
|
||||
arista_pyeapi
|
||||
|
|
@ -42,7 +42,7 @@ execution modules
|
|||
bcache
|
||||
beacons
|
||||
bigip
|
||||
bluez
|
||||
bluez_bluetooth
|
||||
boto3_elasticache
|
||||
boto3_route53
|
||||
boto_apigateway
|
||||
|
|
@ -107,7 +107,7 @@ execution modules
|
|||
ddns
|
||||
deb_apache
|
||||
deb_postgres
|
||||
debbuild
|
||||
debuild_pkgbuild
|
||||
debconfmod
|
||||
debian_ip
|
||||
debian_service
|
||||
|
|
@ -120,13 +120,13 @@ execution modules
|
|||
dnsutil
|
||||
dockercompose
|
||||
dockermod
|
||||
dpkg
|
||||
dpkg_lowpkg
|
||||
drac
|
||||
dracr
|
||||
drbd
|
||||
dummyproxy_package
|
||||
dummyproxy_pkg
|
||||
dummyproxy_service
|
||||
ebuild
|
||||
ebuildpkg
|
||||
eix
|
||||
elasticsearch
|
||||
environ
|
||||
|
|
@ -169,14 +169,13 @@ execution modules
|
|||
hg
|
||||
hipchat
|
||||
hosts
|
||||
htpasswd
|
||||
http
|
||||
ifttt
|
||||
ilo
|
||||
icinga2
|
||||
incron
|
||||
influx
|
||||
influx08
|
||||
influxdbmod
|
||||
influxdb08mod
|
||||
infoblox
|
||||
ini_manage
|
||||
inspectlib
|
||||
|
|
@ -210,7 +209,7 @@ execution modules
|
|||
keystoneng
|
||||
kmod
|
||||
kubernetes
|
||||
launchctl
|
||||
launchctl_service
|
||||
layman
|
||||
ldap3
|
||||
ldapmod
|
||||
|
|
@ -230,14 +229,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
|
||||
|
|
@ -252,7 +251,7 @@ execution modules
|
|||
marathon
|
||||
match
|
||||
mattermost
|
||||
mdadm
|
||||
mdadm_raid
|
||||
mdata
|
||||
memcached
|
||||
mine
|
||||
|
|
@ -270,12 +269,13 @@ execution modules
|
|||
nacl
|
||||
nagios
|
||||
nagios_rpc
|
||||
namecheap_dns
|
||||
namecheap_domains_dns
|
||||
namecheap_domains
|
||||
namecheap_ns
|
||||
namecheap_domains_ns
|
||||
namecheap_ssl
|
||||
namecheap_users
|
||||
napalm_acl
|
||||
napalm_mod
|
||||
napalm_netacl
|
||||
napalm_bgp
|
||||
napalm_formula
|
||||
napalm_mod
|
||||
|
|
@ -308,7 +308,7 @@ execution modules
|
|||
omapi
|
||||
openbsd_sysctl
|
||||
openbsdpkg
|
||||
openbsdrcctl
|
||||
openbsdrcctl_service
|
||||
openbsdservice
|
||||
openscap
|
||||
openstack_config
|
||||
|
|
@ -319,13 +319,13 @@ execution modules
|
|||
oracle
|
||||
osquery
|
||||
out
|
||||
pacman
|
||||
pacmanpkg
|
||||
pagerduty
|
||||
pagerduty_util
|
||||
pam
|
||||
panos
|
||||
parallels
|
||||
parted
|
||||
parted_partition
|
||||
pcs
|
||||
pdbedit
|
||||
pecl
|
||||
|
|
@ -366,7 +366,7 @@ execution modules
|
|||
rdp
|
||||
redismod
|
||||
reg
|
||||
rest_package
|
||||
rest_pkg
|
||||
rest_sample_utils
|
||||
rest_service
|
||||
restartcheck
|
||||
|
|
@ -374,8 +374,8 @@ execution modules
|
|||
rh_ip
|
||||
rh_service
|
||||
riak
|
||||
rpm
|
||||
rpmbuild
|
||||
rpm_lowpkg
|
||||
rpmbuild_pkgbuild
|
||||
rsync
|
||||
runit
|
||||
rvm
|
||||
|
|
@ -404,14 +404,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
|
||||
|
|
@ -419,7 +419,7 @@ execution modules
|
|||
splunk_search
|
||||
sqlite3
|
||||
ssh
|
||||
ssh_package
|
||||
ssh_pkg
|
||||
ssh_service
|
||||
snapper
|
||||
state
|
||||
|
|
@ -437,7 +437,7 @@ execution modules
|
|||
sysrc
|
||||
system
|
||||
system_profiler
|
||||
systemd
|
||||
systemd_service
|
||||
telegram
|
||||
telemetry
|
||||
temp
|
||||
|
|
@ -453,7 +453,7 @@ execution modules
|
|||
tuned
|
||||
twilio_notify
|
||||
udev
|
||||
upstart
|
||||
upstart_service
|
||||
uptime
|
||||
useradd
|
||||
uwsgi
|
||||
|
|
@ -467,6 +467,7 @@ execution modules
|
|||
virtualenv_mod
|
||||
vmctl
|
||||
vsphere
|
||||
webutil
|
||||
win_autoruns
|
||||
win_certutil
|
||||
win_dacl
|
||||
|
|
@ -488,7 +489,7 @@ execution modules
|
|||
win_pki
|
||||
win_powercfg
|
||||
win_psget
|
||||
win_repo
|
||||
winrepo
|
||||
win_servermanager
|
||||
win_service
|
||||
win_shadow
|
||||
|
|
@ -501,7 +502,7 @@ execution modules
|
|||
win_useradd
|
||||
win_wua
|
||||
x509
|
||||
xapi
|
||||
xapi_virt
|
||||
xbpspkg
|
||||
xfs
|
||||
xmpp
|
||||
|
|
@ -516,4 +517,4 @@ execution modules
|
|||
zonecfg
|
||||
zookeeper
|
||||
zpool
|
||||
zypper
|
||||
zypperpkg
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
salt.modules.apk module
|
||||
=======================
|
||||
|
||||
.. automodule:: salt.modules.apk
|
||||
:members:
|
||||
:undoc-members:
|
||||
7
doc/ref/modules/all/salt.modules.apkpkg.rst
Normal file
7
doc/ref/modules/all/salt.modules.apkpkg.rst
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
===================
|
||||
salt.modules.apkpkg
|
||||
===================
|
||||
|
||||
.. automodule:: salt.modules.apkpkg
|
||||
:members:
|
||||
:undoc-members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
==================
|
||||
salt.modules.bluez
|
||||
==================
|
||||
|
||||
.. automodule:: salt.modules.bluez
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.bluez_bluetooth.rst
Normal file
6
doc/ref/modules/all/salt.modules.bluez_bluetooth.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
============================
|
||||
salt.modules.bluez_bluetooth
|
||||
============================
|
||||
|
||||
.. automodule:: salt.modules.bluez_bluetooth
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
=====================
|
||||
salt.modules.debbuild
|
||||
=====================
|
||||
|
||||
.. automodule:: salt.modules.debbuild
|
||||
:members:
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
==============================
|
||||
salt.modules.napalm_acl module
|
||||
salt.modules.debuild_pkgbuild
|
||||
==============================
|
||||
|
||||
.. automodule:: salt.modules.napalm_acl
|
||||
.. automodule:: salt.modules.debuild_pkgbuild
|
||||
:members:
|
||||
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
=================
|
||||
salt.modules.dpkg
|
||||
=================
|
||||
|
||||
.. automodule:: salt.modules.dpkg
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.dpkg_lowpkg.rst
Normal file
6
doc/ref/modules/all/salt.modules.dpkg_lowpkg.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
========================
|
||||
salt.modules.dpkg_lowpkg
|
||||
========================
|
||||
|
||||
.. automodule:: salt.modules.dpkg_lowpkg
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
salt.modules.dummyproxy_package module
|
||||
======================================
|
||||
|
||||
.. automodule:: salt.modules.dummyproxy_package
|
||||
:members:
|
||||
:undoc-members:
|
||||
7
doc/ref/modules/all/salt.modules.dummyproxy_pkg.rst
Normal file
7
doc/ref/modules/all/salt.modules.dummyproxy_pkg.rst
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
==================================
|
||||
salt.modules.dummyproxy_pkg module
|
||||
==================================
|
||||
|
||||
.. automodule:: salt.modules.dummyproxy_pkg
|
||||
:members:
|
||||
:undoc-members:
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
===================
|
||||
salt.modules.ebuild
|
||||
===================
|
||||
|
||||
.. automodule:: salt.modules.ebuild
|
||||
:members:
|
||||
:exclude-members: available_version
|
||||
7
doc/ref/modules/all/salt.modules.ebuildpkg.rst
Normal file
7
doc/ref/modules/all/salt.modules.ebuildpkg.rst
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
======================
|
||||
salt.modules.ebuildpkg
|
||||
======================
|
||||
|
||||
.. automodule:: salt.modules.ebuildpkg
|
||||
:members:
|
||||
:exclude-members: available_version
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
=====================
|
||||
salt.modules.htpasswd
|
||||
=====================
|
||||
|
||||
.. automodule:: salt.modules.htpasswd
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
===================
|
||||
salt.modules.influx
|
||||
===================
|
||||
|
||||
.. automodule:: salt.modules.influx
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
salt.modules.influx08 module
|
||||
============================
|
||||
|
||||
.. automodule:: salt.modules.influx08
|
||||
:members:
|
||||
:undoc-members:
|
||||
7
doc/ref/modules/all/salt.modules.influxdb08mod.rst
Normal file
7
doc/ref/modules/all/salt.modules.influxdb08mod.rst
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
==========================
|
||||
salt.modules.influxdb08mod
|
||||
==========================
|
||||
|
||||
.. automodule:: salt.modules.influxdb08mod
|
||||
:members:
|
||||
:undoc-members:
|
||||
6
doc/ref/modules/all/salt.modules.influxdbmod.rst
Normal file
6
doc/ref/modules/all/salt.modules.influxdbmod.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
========================
|
||||
salt.modules.influxdbmod
|
||||
========================
|
||||
|
||||
.. automodule:: salt.modules.influxdbmod
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
======================
|
||||
salt.modules.launchctl
|
||||
======================
|
||||
|
||||
.. automodule:: salt.modules.launchctl
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.launchctl_service.rst
Normal file
6
doc/ref/modules/all/salt.modules.launchctl_service.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
==============================
|
||||
salt.modules.launchctl_service
|
||||
==============================
|
||||
|
||||
.. automodule:: salt.modules.launchctl_service
|
||||
:members:
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
salt.modules.mac_brew module
|
||||
============================
|
||||
|
||||
.. automodule:: salt.modules.mac_brew
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.mac_brew_pkg.rst
Normal file
6
doc/ref/modules/all/salt.modules.mac_brew_pkg.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
=========================
|
||||
salt.modules.mac_brew_pkg
|
||||
=========================
|
||||
|
||||
.. automodule:: salt.modules.mac_brew_pkg
|
||||
:members:
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
salt.modules.mac_defaults module
|
||||
================================
|
||||
|
||||
.. automodule:: salt.modules.mac_defaults
|
||||
:members:
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
salt.modules.mac_package module
|
||||
===============================
|
||||
|
||||
.. automodule:: salt.modules.mac_package
|
||||
:members:
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
salt.modules.mac_ports module
|
||||
=============================
|
||||
|
||||
.. automodule:: salt.modules.mac_ports
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.mac_portspkg.rst
Normal file
6
doc/ref/modules/all/salt.modules.mac_portspkg.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
=========================
|
||||
salt.modules.mac_portspkg
|
||||
=========================
|
||||
|
||||
.. automodule:: salt.modules.mac_portspkg
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.macdefaults.rst
Normal file
6
doc/ref/modules/all/salt.modules.macdefaults.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
========================
|
||||
salt.modules.macdefaults
|
||||
========================
|
||||
|
||||
.. automodule:: salt.modules.macdefaults
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.macpackage.rst
Normal file
6
doc/ref/modules/all/salt.modules.macpackage.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
=======================
|
||||
salt.modules.macpackage
|
||||
=======================
|
||||
|
||||
.. automodule:: salt.modules.macpackage
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
==================
|
||||
salt.modules.mdadm
|
||||
==================
|
||||
|
||||
.. automodule:: salt.modules.mdadm
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.mdadm_raid.rst
Normal file
6
doc/ref/modules/all/salt.modules.mdadm_raid.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
=======================
|
||||
salt.modules.mdadm_raid
|
||||
=======================
|
||||
|
||||
.. automodule:: salt.modules.mdadm_raid
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
salt.modules.namecheap_dns module
|
||||
=================================
|
||||
|
||||
.. automodule:: salt.modules.namecheap_dns
|
||||
:members:
|
||||
:undoc-members:
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
==================================
|
||||
salt.modules.namecheap_domains_dns
|
||||
==================================
|
||||
|
||||
.. automodule:: salt.modules.namecheap_domains_dns
|
||||
:members:
|
||||
:undoc-members:
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
=================================
|
||||
salt.modules.namecheap_domains_ns
|
||||
=================================
|
||||
|
||||
.. automodule:: salt.modules.namecheap_domains_ns
|
||||
:members:
|
||||
:undoc-members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
salt.modules.namecheap_ns module
|
||||
================================
|
||||
|
||||
.. automodule:: salt.modules.namecheap_ns
|
||||
:members:
|
||||
:undoc-members:
|
||||
7
doc/ref/modules/all/salt.modules.napalm_netacl.rst
Normal file
7
doc/ref/modules/all/salt.modules.napalm_netacl.rst
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
==========================
|
||||
salt.modules.napalm_netacl
|
||||
==========================
|
||||
|
||||
.. automodule:: salt.modules.napalm_netacl
|
||||
:members:
|
||||
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
=========================
|
||||
salt.modules.openbsdrcctl
|
||||
=========================
|
||||
|
||||
.. automodule:: salt.modules.openbsdrcctl
|
||||
:members:
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
====================================
|
||||
salt.modules.openbsdrcctl_service.py
|
||||
====================================
|
||||
|
||||
.. automodule:: salt.modules.openbsdrcctl_service
|
||||
:members:
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
===================
|
||||
salt.modules.pacman
|
||||
===================
|
||||
|
||||
.. automodule:: salt.modules.pacman
|
||||
:members:
|
||||
:exclude-members: available_version
|
||||
7
doc/ref/modules/all/salt.modules.pacmanpkg.rst
Normal file
7
doc/ref/modules/all/salt.modules.pacmanpkg.rst
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
======================
|
||||
salt.modules.pacmanpkg
|
||||
======================
|
||||
|
||||
.. automodule:: salt.modules.pacmanpkg
|
||||
:members:
|
||||
:exclude-members: available_version
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
===================
|
||||
salt.modules.parted
|
||||
===================
|
||||
|
||||
.. automodule:: salt.modules.parted
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.parted_partition.rst
Normal file
6
doc/ref/modules/all/salt.modules.parted_partition.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
=============================
|
||||
salt.modules.parted_partition
|
||||
=============================
|
||||
|
||||
.. automodule:: salt.modules.parted_partition
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
=========================
|
||||
salt.modules.rest_package
|
||||
=========================
|
||||
|
||||
.. automodule:: salt.modules.rest_package
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.rest_pkg.rst
Normal file
6
doc/ref/modules/all/salt.modules.rest_pkg.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
=====================
|
||||
salt.modules.rest_pkg
|
||||
=====================
|
||||
|
||||
.. automodule:: salt.modules.rest_pkg
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
================
|
||||
salt.modules.rpm
|
||||
================
|
||||
|
||||
.. automodule:: salt.modules.rpm
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.rpm_lowpkg.rst
Normal file
6
doc/ref/modules/all/salt.modules.rpm_lowpkg.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
=======================
|
||||
salt.modules.rpm_lowpkg
|
||||
=======================
|
||||
|
||||
.. automodule:: salt.modules.rpm_lowpkg
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
=====================
|
||||
salt.modules.rpmbuild
|
||||
=====================
|
||||
|
||||
.. automodule:: salt.modules.rpmbuild
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.rpmbuild_pkgbuild.rst
Normal file
6
doc/ref/modules/all/salt.modules.rpmbuild_pkgbuild.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
==============================
|
||||
salt.modules.rpmbuild_pkgbuild
|
||||
==============================
|
||||
|
||||
.. automodule:: salt.modules.rpmbuild_pkgbuild
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
================
|
||||
salt.modules.smf
|
||||
================
|
||||
|
||||
.. automodule:: salt.modules.smf
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.smf_service.rst
Normal file
6
doc/ref/modules/all/salt.modules.smf_service.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
========================
|
||||
salt.modules.smf_service
|
||||
========================
|
||||
|
||||
.. automodule:: salt.modules.smf_service
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
=======================
|
||||
salt.modules.solarisips
|
||||
=======================
|
||||
|
||||
.. automodule:: salt.modules.solarisips
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.solarisipspkg.rst
Normal file
6
doc/ref/modules/all/salt.modules.solarisipspkg.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
==========================
|
||||
salt.modules.solarisipspkg
|
||||
==========================
|
||||
|
||||
.. automodule:: salt.modules.solarisipspkg
|
||||
:members:
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
salt.modules.ssh_package module
|
||||
===============================
|
||||
|
||||
.. automodule:: salt.modules.ssh_package
|
||||
:members:
|
||||
5
doc/ref/modules/all/salt.modules.ssh_pkg.rst
Normal file
5
doc/ref/modules/all/salt.modules.ssh_pkg.rst
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
salt.modules.ssh_pkg
|
||||
====================
|
||||
|
||||
.. automodule:: salt.modules.ssh_pkg
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
====================
|
||||
salt.modules.systemd
|
||||
====================
|
||||
|
||||
.. automodule:: salt.modules.systemd
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.systemd_service.rst
Normal file
6
doc/ref/modules/all/salt.modules.systemd_service.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
============================
|
||||
salt.modules.systemd_service
|
||||
============================
|
||||
|
||||
.. automodule:: salt.modules.systemd_service
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
====================
|
||||
salt.modules.upstart
|
||||
====================
|
||||
|
||||
.. automodule:: salt.modules.upstart
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.upstart_service.rst
Normal file
6
doc/ref/modules/all/salt.modules.upstart_service.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
============================
|
||||
salt.modules.upstart_service
|
||||
============================
|
||||
|
||||
.. automodule:: salt.modules.upstart_service
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.webutil.rst
Normal file
6
doc/ref/modules/all/salt.modules.webutil.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
====================
|
||||
salt.modules.webutil
|
||||
====================
|
||||
|
||||
.. automodule:: salt.modules.webutil
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
=====================
|
||||
salt.modules.win_repo
|
||||
=====================
|
||||
|
||||
.. automodule:: salt.modules.win_repo
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.winrepo.rst
Normal file
6
doc/ref/modules/all/salt.modules.winrepo.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
====================
|
||||
salt.modules.winrepo
|
||||
====================
|
||||
|
||||
.. automodule:: salt.modules.winrepo
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
=================
|
||||
salt.modules.xapi
|
||||
=================
|
||||
|
||||
.. automodule:: salt.modules.xapi
|
||||
:members:
|
||||
6
doc/ref/modules/all/salt.modules.xapi_virt.rst
Normal file
6
doc/ref/modules/all/salt.modules.xapi_virt.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
======================
|
||||
salt.modules.xapi_virt
|
||||
======================
|
||||
|
||||
.. automodule:: salt.modules.xapi_virt
|
||||
:members:
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
===================
|
||||
salt.modules.zypper
|
||||
===================
|
||||
|
||||
.. automodule:: salt.modules.zypper
|
||||
:members:
|
||||
:exclude-members: list_updates, available_version
|
||||
7
doc/ref/modules/all/salt.modules.zypperpkg.rst
Normal file
7
doc/ref/modules/all/salt.modules.zypperpkg.rst
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
======================
|
||||
salt.modules.zypperpkg
|
||||
======================
|
||||
|
||||
.. automodule:: salt.modules.zypperpkg
|
||||
:members:
|
||||
:exclude-members: list_updates, available_version
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
==================
|
||||
salt.output.no_out
|
||||
==================
|
||||
|
||||
.. automodule:: salt.output.no_out
|
||||
:members:
|
||||
6
doc/ref/output/all/salt.output.no_out_quiet.rst
Normal file
6
doc/ref/output/all/salt.output.no_out_quiet.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
========================
|
||||
salt.output.no_out_quiet
|
||||
========================
|
||||
|
||||
.. automodule:: salt.output.no_out_quiet
|
||||
:members:
|
||||
|
|
@ -31,7 +31,7 @@ returner modules
|
|||
mongo_return
|
||||
multi_returner
|
||||
mysql
|
||||
nagios_return
|
||||
nagios_nrdp_return
|
||||
odbc
|
||||
pgjsonb
|
||||
postgres
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
=================================
|
||||
salt.returners.nagios_nrdp_return
|
||||
=================================
|
||||
|
||||
.. automodule:: salt.returners.nagios_nrdp_return
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
============================
|
||||
salt.returners.nagios_return
|
||||
============================
|
||||
|
||||
.. automodule:: salt.returners.nagios_return
|
||||
:members:
|
||||
|
|
@ -114,7 +114,6 @@ state modules
|
|||
hg
|
||||
hipchat
|
||||
host
|
||||
htpasswd
|
||||
http
|
||||
icinga2
|
||||
ifttt
|
||||
|
|
@ -165,13 +164,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
|
||||
|
|
@ -191,7 +190,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
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
====================
|
||||
salt.states.htpasswd
|
||||
====================
|
||||
|
||||
.. automodule:: salt.states.htpasswd
|
||||
:members:
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
salt.states.mac_defaults module
|
||||
===============================
|
||||
|
||||
.. automodule:: salt.states.mac_defaults
|
||||
:members:
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
salt.states.mac_package module
|
||||
==============================
|
||||
|
||||
.. automodule:: salt.states.mac_package
|
||||
:members:
|
||||
6
doc/ref/states/all/salt.states.macdefaults.rst
Normal file
6
doc/ref/states/all/salt.states.macdefaults.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
=======================
|
||||
salt.states.macdefaults
|
||||
=======================
|
||||
|
||||
.. automodule:: salt.states.macdefaults
|
||||
:members:
|
||||
6
doc/ref/states/all/salt.states.macpackage.rst
Normal file
6
doc/ref/states/all/salt.states.macpackage.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
======================
|
||||
salt.states.macpackage
|
||||
======================
|
||||
|
||||
.. automodule:: salt.states.macpackage
|
||||
:members:
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
=================
|
||||
salt.states.mdadm
|
||||
=================
|
||||
|
||||
.. automodule:: salt.states.mdadm
|
||||
:members:
|
||||
6
doc/ref/states/all/salt.states.mdadm_raid.rst
Normal file
6
doc/ref/states/all/salt.states.mdadm_raid.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
======================
|
||||
salt.states.mdadm_raid
|
||||
======================
|
||||
|
||||
.. automodule:: salt.states.mdadm_raid
|
||||
:members:
|
||||
7
doc/ref/states/all/salt.states.net_napalm_yang.rst
Normal file
7
doc/ref/states/all/salt.states.net_napalm_yang.rst
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
===========================
|
||||
salt.states.net_napalm_yang
|
||||
===========================
|
||||
|
||||
.. automodule:: salt.states.net_napalm_yang
|
||||
:members:
|
||||
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
===================
|
||||
salt.states.netyang
|
||||
===================
|
||||
|
||||
.. automodule:: salt.states.netyang
|
||||
:members:
|
||||
|
||||
6
doc/ref/states/all/salt.states.webutil.rst
Normal file
6
doc/ref/states/all/salt.states.webutil.rst
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
===================
|
||||
salt.states.webutil
|
||||
===================
|
||||
|
||||
.. automodule:: salt.states.webutil
|
||||
:members:
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>Label</key>
|
||||
<string>salt-minion</string>
|
||||
<string>com.saltstack.salt.minion</string>
|
||||
<key>RunAtLoad</key>
|
||||
<true/>
|
||||
<key>KeepAlive</key>
|
||||
|
|
|
|||
|
|
@ -341,6 +341,16 @@ class Minion(salt.utils.parsers.MinionOptionParser, DaemonsMixin): # pylint: di
|
|||
NOTE: Run any required code before calling `super()`.
|
||||
'''
|
||||
super(Minion, self).start()
|
||||
while True:
|
||||
try:
|
||||
self._real_start()
|
||||
except SaltClientError as exc:
|
||||
# Restart for multi_master failover when daemonized
|
||||
if self.options.daemon:
|
||||
continue
|
||||
break
|
||||
|
||||
def _real_start(self):
|
||||
try:
|
||||
if check_user(self.config['user']):
|
||||
self.action_log_info('Starting up')
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -669,6 +669,7 @@ def _deploy_salt_minion(name, session, vm_):
|
|||
vm_['ssh_host'] = get_vm_ip(name, session)
|
||||
vm_['user'] = vm_.get('user', 'root')
|
||||
vm_['password'] = vm_.get('password', 'p@ssw0rd!')
|
||||
vm_['provider'] = vm_.get('provider', 'xen')
|
||||
log.debug('%s has IP of %s', name, vm_['ssh_host'])
|
||||
# Bootstrap Salt minion!
|
||||
if vm_['ssh_host'] is not None:
|
||||
|
|
|
|||
|
|
@ -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__():
|
||||
|
|
|
|||
|
|
@ -924,7 +924,7 @@ def trust_key(keyid=None,
|
|||
|
||||
if user == 'salt':
|
||||
homeDir = os.path.join(__salt__['config.get']('config_dir'), 'gpgkeys')
|
||||
cmd.extend([' --homedir', homeDir])
|
||||
cmd.extend(['--homedir', homeDir])
|
||||
_user = 'root'
|
||||
res = __salt__['cmd.run_all'](cmd,
|
||||
stdin=stdin,
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ def get_locale():
|
|||
if lc_ctl and not (__grains__['os_family'] in ['Suse'] and __grains__['osmajorrelease'] in [12]):
|
||||
ret = (_parse_dbus_locale() if dbus is not None else _localectl_status()['system_locale']).get('LANG', '')
|
||||
else:
|
||||
if 'Suse' in __grains__['os_family'] and __grains__['osmajorrelease'] == 12:
|
||||
if 'Suse' in __grains__['os_family']:
|
||||
cmd = 'grep "^RC_LANG" /etc/sysconfig/language'
|
||||
elif 'RedHat' in __grains__['os_family']:
|
||||
cmd = 'grep "^LANG=" /etc/sysconfig/i18n'
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue