valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,479 Commits 24 Branches 182 Tags 341 MiB
0c566dce89
Commit Graph

68479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
376bec0455 Merge pull request #34281 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-24 17:51:43 -04:00
rallytime
5f45a8ff73 Don't require 'domain' to be present before checking fqdn_ip* grains 
Fixes #34129
 2016-06-24 15:43:31 -06:00
Jorge Schrauwen
d633e774ea actually do the cleanup, oops 2016-06-24 23:42:06 +02:00
Jorge Schrauwen
987c240850 minor cleanup 2016-06-24 23:40:27 +02:00
Jorge Schrauwen
c3667203bf add test for vfstab 2016-06-24 23:33:39 +02:00
Jorge Schrauwen
80e9d1d278 set __grains__ for fstab unit test 2016-06-24 23:28:53 +02:00
Jorge Schrauwen
f0f5d449c3 mount.vfstab implemented on Solaris like platforms 2016-06-24 23:26:20 +02:00
rallytime
ae8ad9329c Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/renderers/gpg.py
  - tests/unit/renderers/gpg_test.py
 2016-06-24 14:45:37 -06:00
Jorge Schrauwen
4398e8841b undo some changes to mount.fstab and mount.rm_fstab, create mount.vfstab and mount.rm_vfstab 2016-06-24 22:32:20 +02:00
Jorge Schrauwen
133d3bb2bb mount.set_fstab errors out on Solaris like platforms 2016-06-24 22:24:25 +02:00
Jorge Schrauwen
c0863fb024 mount.rm_fstab works with Solaris like platforms 2016-06-24 22:17:38 +02:00
Jorge Schrauwen
151799ea74 initial vfstab support (Solaris like platforms) 
Introduce vfstab support for mount.fstab, entries for opts look a bit
weird. Default are '-' so it will end up as a list containing '-'.

I left this to keep 'opts' the same as for normal fstabs.

Example output:

    /dev/fd:
        ----------
        device:
            fd
        device_fsck:
            -
        fstype:
            fd
        mount_at_boot:
            no
        opts:
            - -
        pass_fsck:
            -
    /devices:
        ----------
        device:
            /devices
        device_fsck:
            -
        fstype:
            devfs
        mount_at_boot:
            no
        opts:
            - -
        pass_fsck:
            -
    /etc/dfs/sharetab:
        ----------
        device:
            sharefs
        device_fsck:
            -
        fstype:
            sharefs
        mount_at_boot:
            no
        opts:
            - -
        pass_fsck:
            -
    /proc:
        ----------
        device:
            /proc
        device_fsck:
            -
        fstype:
            proc
        mount_at_boot:
            no
        opts:
            - -
        pass_fsck:
            -
    /system/contract:
        ----------
        device:
            ctfs
        device_fsck:
            -
        fstype:
            ctfs
        mount_at_boot:
            no
        opts:
            - -
        pass_fsck:
            -
    /system/object:
        ----------
        device:
            objfs
        device_fsck:
            -
        fstype:
            objfs
        mount_at_boot:
            no
        opts:
            - -
        pass_fsck:
            -
    /tmp:
        ----------
        device:
            swap
        device_fsck:
            -
        fstype:
            tmpfs
        mount_at_boot:
            yes
        opts:
            - size=2048m
        pass_fsck:
            -
 2016-06-24 22:06:18 +02:00
Mike Place
d235b1245b Merge pull request #34233 from thegoodduke/for_2015.8_ipset 
ipset: fix the comment containing blank
 2016-06-24 12:28:34 -07:00
Mike Place
65c5675a3f Merge pull request #34257 from rallytime/fix-34037 
Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer
 2016-06-24 10:25:04 -07:00
Mike Place
203870f147 Merge pull request #34274 from clinta/2015.8 
Don't escape source before calling managed
 2016-06-24 10:23:35 -07:00
Mike Place
805171c949 Merge pull request #34271 from Unity-Technologies/hotfix/windows_symlinks 
Fixed symlinks on windows where the slashes don't match
 2016-06-24 10:05:25 -07:00
rallytime
d7a5e9b10e Remove test that doesn't actually test anything 2016-06-24 09:10:13 -06:00
Clint Armstrong
6572454918 Don't escape source before calling managed 2016-06-24 11:08:25 -04:00
Jorge Schrauwen
a09055cba7 Fix for #14915 (#34254) 
* mount.swaps now works on solarish like systems

* mount.swapon / mount.swapoff supported on solarish platforms

* mount.active (and internal consumers) now work on all solarish platforms

* unit-tests - mount_tests should set kernel grain
 2016-06-24 10:32:48 -04:00
Nicole Thomas
39579ce5f6 Merge pull request #34259 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-24 10:27:30 -04:00
Nicole Thomas
a59dc85a15 Merge pull request #34258 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-06-24 10:27:06 -04:00
Daniel Hobley
e0a1a55431 Fixed symlinks on windows where the slashes don't match 
- This commit fixes detecting whether a symlink is correctly setup or not, we now make sure that we are testing the normalised paths
 2016-06-24 13:43:19 +02:00
C. Gao
4da5e35bf4 ipset: fix the comment containing blank 2016-06-24 16:31:42 +08:00
rallytime
eeaf3cc1e7 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-23 17:07:59 -06:00
rallytime
ea914b67cd Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-06-23 16:42:33 -06:00
rallytime
c4c037d600 Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer 
This change makes it possible for --config-dir to work from the CLI.

Fixes #34037
 2016-06-23 16:31:17 -06:00
Mike Place
92962957c8 Merge pull request #34093 from terminalmage/issue33873 
Catch CommandExecutionError in pkg states
 2016-06-23 14:00:13 -07:00
Mike Place
cb5399787c Merge pull request #34136 from meaksh/salt-suse-os-detection-2015.8 
Fixed behavior for SUSE OS grains in 2015.8
 2016-06-23 13:24:58 -07:00
Mike Place
3acda896f2 Merge pull request #34134 from meaksh/salt-suse-os-detection 
Fixed behavior for SUSE OS grains in 2016.3
 2016-06-23 13:24:51 -07:00
Daniel Wallace
82183f1572 return list of nodes for lxc driver when called directly 
This is required so that salt-cloud sees a dictionary list of lxc
containers that exist so that they do not attempt to recreate the
container.

The downside to this is that if the container is stopped, it is not
started.

Fixes #33633
 2016-06-23 14:39:48 -05:00
Mike Place
5f42fd4486 Merge pull request #34159 from christoe/2016.3 
Fixes to the win_task module
 2016-06-23 10:54:52 -07:00
Mike Place
8d5ed91980 Merge pull request #34225 from richardscollin/fix-win-set-datetime 
Fix win_system.set_system_date_time
 2016-06-23 10:49:48 -07:00
Mike Place
0a0267149f Merge pull request #34223 from peterdemin/bugfix-eauth-ldap-expanding 
Fixed typo in filtering LDAP's potential_ous
 2016-06-23 10:26:31 -07:00
Mike Place
f74f176bd5 Merge pull request #34239 from vutny/file-find-broken-symlinks 
file.find module: fix handling of broken symlinks
 2016-06-23 10:25:17 -07:00
Mike Place
cb1e8bf082 Merge pull request #34232 from thegoodduke/for_2015.5_ipset 
ipset: fix commont containing blank
 2016-06-23 10:08:05 -07:00
Denys Havrysh
7e164c4f86 file.find module: fix handling of broken symlinks 2016-06-23 12:24:53 +03:00
C. Gao
344eb60762 ipset: fix commont containing blank 2016-06-23 11:14:58 +08:00
Nicole Thomas
4157f6fd39 Merge pull request #34229 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-22 18:57:00 -04:00
rallytime
940ac86d4e Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-22 16:06:11 -06:00
lomeroe
56c7267631 fix regression from #33681 which causes pulling a list of s3 objects via s3.query to fail (#34208) 2016-06-22 17:02:33 -04:00
Erik Johnson
02eb331494 Fix a pair of gitfs bugs (#34218) 
* Add salt.utils.is_hex()

* dulwich: use salt.utils.is_hex() to confirm ref is hexidecimal

* Restore ability for SHA1 saltenvs to be used in gitfs

This uses salt.utils.is_hex() to check if the desired environment is
hex, and allowing it to be used for gitfs operations when it is.

* pygit2: Catch ValueError when trying to resolve SHA1

Hex SHAs which are less than 4 characters will raise a ValueError, this
commit catches these exceptions.

See https://github.com/saltstack/salt/issues/34213 for more information.
 2016-06-22 16:11:06 -04:00
Collin Richards
6286771ef7 Fix win_system.set_system_date_time 
Previously time values could not be set to zero and would simply leave
the previous time value when attempting to set the time.
 2016-06-22 14:37:49 -05:00
Mike Place
b5ea1495af Merge pull request #34214 from rallytime/fix-33879 
Update saltutil.wheel docs to specify remote vs local minion behavior
 2016-06-22 12:22:30 -07:00
Mike Place
6d643cd528 Merge pull request #34182 from rallytime/fix-34043 
Handle child PIDs differently depending on the availability of psutils
 2016-06-22 12:22:06 -07:00
Mike Place
4205fd605c Merge pull request #34209 from lomeroe/fix_s3_utils_regression_33682 
fix regression in s3.query from #33682
 2016-06-22 11:50:19 -07:00
Mike Place
05a4785c8c Merge pull request #34222 from cachedout/lint_34200 
Lint 34200
 2016-06-22 11:48:53 -07:00
Peter
8bb03ec109 Fixed typo in filtering LDAP's potential_ous 2016-06-22 14:45:04 -04:00
Mike Place
eadf80a56f Linted #34200 2016-06-22 12:38:29 -06:00
Erik Johnson
5d3ec31564 Clarify pkg.list_repo_pkgs docstring for held packages (#34188) 2016-06-22 13:54:59 -04:00
rallytime
1be05f6a87 Update saltutil.wheel docs to specify remote vs local minion behavior 
Fixes #33879
 2016-06-22 11:44:46 -06:00