Commit Graph

84538 Commits

Author SHA1 Message Date
Gareth J. Greenaway
cf1a4ff2d6 Fixing some typos in adb beacon, updating unit tests to reflect changes 2017-08-14 12:04:36 -07:00
Gareth J. Greenaway
0f19ae37bf Updating the bonjour_announce beacon to use list based configuration instead of dictionary based configuration. Fixing some typos in the avahi_announce beacon. 2017-08-14 12:04:36 -07:00
Gareth J. Greenaway
ecc731a047 Updating the avahi_announce beacon to use list based configuration instead of dictionary based configuration. Fixing some typos in the adb beacon. 2017-08-14 12:04:36 -07:00
Gareth J. Greenaway
6db0cce5ee Updating adb beacon to use list based configuration instead of dictionary based configuration 2017-08-14 12:04:36 -07:00
Gareth J. Greenaway
91994f1556 Updating the inotify, journald, pkg, and service beacons to use list based configuration instead of dictionary based configuration. 2017-08-14 12:04:36 -07:00
Gareth J. Greenaway
a013eb0876 Updating the documentation in service beacon. 2017-08-14 12:04:36 -07:00
Gareth J. Greenaway
2a399fdbe9 Branch to fix beacons, ensure validate function is called, etc 2017-08-14 12:04:36 -07:00
Nicole Thomas
57ad6aebe9 Merge pull request #42760 from AFriemann/develop
Catch TypeError thrown by m2crypto when parsing missing subjects in c…
2017-08-14 14:58:05 -04:00
Nicole Thomas
31701bd34d Merge pull request #42787 from skizunov/develop5
Add --skip-grains option to salt-run
2017-08-14 14:51:15 -04:00
Nicole Thomas
0fee25be1c Merge pull request #42816 from sitepoint/rbenv_test_mode
Implement rbenv state module test mode checks
2017-08-14 14:33:08 -04:00
Nicole Thomas
ce941cf889 Merge pull request #42876 from isbm/isbm-salt-ssh-no-roster-devel
Updates to Salt SSH
2017-08-14 14:30:46 -04:00
Nicole Thomas
770f7d3ddc Merge pull request #42901 from aphor/zfs-fuse_support
Add support for zfs-fuse to zfs.__virtual__()
2017-08-14 12:26:34 -04:00
garethgreenaway
9927fd315a Merge pull request #42830 from spenceation/panos/develop
Panos/develop
2017-08-14 08:40:49 -07:00
Nicole Thomas
1f6e6a6abb Whitespace fix 2017-08-14 10:21:32 -04:00
Bo Maryniuk
aa9d84ebba Lintfix W8470: possible resource leakage. 2017-08-14 15:04:11 +02:00
Bo Maryniuk
77cd3138c8 Move 'which' to the new path 2017-08-14 15:04:11 +02:00
Bo Maryniuk
1b8ea9e9d9 Add known hosts lister 2017-08-14 15:04:11 +02:00
Bo Maryniuk
716f84fd34 Add list hosts option 2017-08-14 15:04:11 +02:00
Bo Maryniuk
015f273c3b Do not expand target if list of hosts/IDs are passed 2017-08-14 15:04:11 +02:00
Bo Maryniuk
51cd42cc1b Refactor target expander 2017-08-14 15:04:11 +02:00
Bo Maryniuk
d96c771a88 Fix PEP8: length of the string 2017-08-14 15:04:11 +02:00
Bo Maryniuk
a3907c8511 Refactor roster update process 2017-08-14 15:04:11 +02:00
Bo Maryniuk
b93d034789 Bugfix: use set to self options, instead of their copies from parameters 2017-08-14 15:04:11 +02:00
Bo Maryniuk
b306bca07a Expand target if it is known or not FQDN 2017-08-14 15:04:11 +02:00
Bo Maryniuk
f839d5ce2d Prevent confusion if roster and target are the same 2017-08-14 15:03:27 +02:00
Bo Maryniuk
c7d0fddd28 Add network utility to recognize if any entity is a reachable/resolvable host 2017-08-14 15:03:27 +02:00
Bo Maryniuk
ed8a3bb92f Add option to skip roster, in case auto-add is not needed 2017-08-14 15:03:27 +02:00
Bo Maryniuk
010d4f2c9b Add to the flat nearby writable roster the current called data 2017-08-14 15:03:27 +02:00
Bo Maryniuk
7a7c0c69e1 Update targets if they are specified in the command-line directly 2017-08-14 15:03:27 +02:00
Bo Maryniuk
400be17e8f Remove unused imports 2017-08-14 15:03:27 +02:00
Adam Bolte
7848189ad4
Implement rbenv state module test mode checks
Fixes #42815 and updates unit tests.
2017-08-14 19:13:42 +10:00
Jeremy McMillan
813fb149c2 Add support for zfs-fuse to zfs.__virtual__()
##What does this PR do?

Some OS distributions which lack OS kernel support for ZFS can support the zfs module if the zfs-fuse daemon is running.

This change checks to see if the service is available, and whether it is running or starts up, and returns appropriately.

With this change, zfs support is extended to all OS platforms with zfs-fuse support in addition to those with kernel support.

##Tests written?

No
2017-08-13 13:01:17 -05:00
spenceation
2b516313f2 Merge branch 'develop' into panos/develop 2017-08-12 16:48:32 -04:00
spenceation
e351974dd9 Updated with requested changes. 2017-08-11 21:24:17 -04:00
Nicole Thomas
af72988af6 Merge pull request #42850 from akelge/develop
Removed '--quiet' to avoid continuous renewal
2017-08-11 15:37:09 -04:00
Nicole Thomas
02c4ae644b Merge pull request #42852 from thatch45/ssh_id
Add a key in opts that identify that we are running salt-ssh
2017-08-11 15:36:10 -04:00
Nicole Thomas
a3635926f3 Merge pull request #42879 from rallytime/oxygen-formatting
Update header markup for subsections
2017-08-11 15:24:30 -04:00
Nicole Thomas
64da744949 Merge pull request #42507 from steverweber/nacl_with_sealedbox
add support for nacl SealedBox and other extras
2017-08-11 14:12:58 -04:00
Nicole Thomas
046e7f2995 Merge branch 'develop' into develop 2017-08-11 11:18:13 -04:00
rallytime
48445ff182 Update header markup for subsections
The header section markup was incorrect in sections with sub-sections,
displaying the header text as smaller than the sub-section header text.

This fixes the header sizes
2017-08-11 10:17:22 -04:00
Nicole Thomas
8aa34c81dd Merge pull request #42554 from joshland/rh_ip_fix
fix: Fedora configuration fails because the sysctls don't exist
2017-08-11 10:01:36 -04:00
Erik Johnson
d2c0474a99 Merge pull request #42100 from rallytime/cloud-runner-dry
Use clean_kwargs from salt.utils in cloud runner
2017-08-11 08:40:58 -05:00
Erik Johnson
804a4e41a9 Merge pull request #42854 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
2017-08-11 08:39:33 -05:00
Nicole Thomas
66511646de Merge pull request #42871 from amalleo25/patch-1
Update joyent.rst
2017-08-11 09:30:31 -04:00
Andrea Mistrali
c613ec8698 Merge branch 'develop' into develop 2017-08-11 07:19:16 +02:00
amalleo25
559a2d448c Update joyent.rst
Missing colon in example cloud.profiles.d config file.
2017-08-10 23:08:38 -04:00
Nicole Thomas
4944bb8d55 Merge branch 'develop' into cloud-runner-dry 2017-08-10 17:49:04 -04:00
rallytime
5d8d6225b5 Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/modules/augeas_cfg.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/runners/manage.py
  - salt/states/boto_cfn.py
  - salt/utils/cloud.py
  - tests/integration/states/test_pkg.py
2017-08-10 14:47:14 -04:00
Nicole Thomas
cf579503d7 Merge branch 'develop' into rh_ip_fix 2017-08-10 14:21:59 -04:00
Nicole Thomas
9f5c60b786 Merge pull request #42849 from terminalmage/fix-moved-funcs
Fix references to functions moved to salt.utils.platform
2017-08-10 14:07:53 -04:00