Commit Graph

68258 Commits

Author SHA1 Message Date
Jorge Schrauwen
f0f5d449c3 mount.vfstab implemented on Solaris like platforms 2016-06-24 23:26:20 +02: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
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
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
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
rallytime
eeaf3cc1e7 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-06-23 17:07:59 -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
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
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
Denys Havrysh
7e164c4f86 file.find module: fix handling of broken symlinks 2016-06-23 12:24:53 +03: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
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
Mike Place
0cbdb73fc5 Merge pull request #34197 from eliasp/2016.3-salt.modules.ssh.recv_known_host-empty_results
Make `module.ssh.recv_known_host()` more resilient against hosts not returning a key
2016-06-22 10:26:02 -07:00
Mike Place
606ae3c886 Merge pull request #34201 from DarkKnightCZ/cmdmod-34199
Suffix temp file with .sr1 and add mandatory argument when executing PowerShell script
2016-06-22 10:21:24 -07:00
Mike Place
cb704b780b Merge pull request #34198 from DarkKnightCZ/cmdmod-34196
Don't use binary mode for cmdmod.exec_code
2016-06-22 10:14:06 -07:00
Mike Place
0578a2f87d Merge pull request #34172 from dmurphy18/debbuild_deps
Support for building with local packages on Debian and Ubuntu
2016-06-22 09:36:44 -07:00
Ethan Moore
a2b99703b1 fix regression in s3.query from #33682
attempting to pull a list of objects from s3 would fail to return the list of objects
2016-06-22 16:26:15 +00:00
Erik Johnson
5bca5c42f1 Change target for dockerng assuming default status to Nitrogen release (#34206)
The work I need to do in the loader to achieve this is not likely to be
done in time for the Carbon release.
2016-06-22 12:04:13 -04:00
Denys Havrysh
37978a1ebe Correct the docstrings formatting in pkgbuild modules and state (#34194) 2016-06-22 11:37:08 -04:00
Lukas Raska
05748743bc Suffix temp file with .sr1 and add -File argument when executing PowerShell code via cmdmod.exec_code
Fixes #34199
2016-06-22 13:00:49 +02:00
Ignat Korchagin
2cd0433f8d Fix parted module set CLI example 2016-06-22 11:38:15 +01:00
Lukas Raska
04553cd3de Don't use binary mode for cmdmod.exec_code
Fixes #34196
2016-06-22 12:11:34 +02:00
Elias Probst
82c4b1229e
Make module.ssh.recv_known_host() more resilient against hosts not returning a key
Some providers (esp. Bitbucket) have faulty git/SSH endpoints which
often simply return empty results. A previous attempt in Salt to improve
this by adding an optional timeout value didn't change much here, as it
just increased the time it took to return: nothing.

Repeating the request a few times until the host returns a value works
around this issue far more reliable.

Signed-off-by: Elias Probst <mail@eliasprobst.eu>
2016-06-22 12:10:23 +02:00
Nicole Thomas
a8429c2595 Merge pull request #34186 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-06-21 19:26:34 -04:00
rallytime
318c2ed6a1 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/salt.py
  - salt/modules/grains.py
  - tests/unit/modules/boto_vpc_test.py
2016-06-21 16:03:31 -06:00
Nicole Thomas
1c4369d093 Merge pull request #34184 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-06-21 17:43:46 -04:00
rallytime
8e36e90966 Merge branch '2015.5' into '2015.8'
Conflicts:
  - tests/unit/modules/boto_vpc_test.py
2016-06-21 14:47:23 -06:00
rallytime
b7d49c5052 Handle child PIDs differently depending on the availability of psutils
Fixes #34043
2016-06-21 14:21:16 -06:00
Mike Place
5411ebb3b4 Merge pull request #34141 from jtand/boto_vpc_test_fix
Fixed boto_vpc_test failure
2016-06-21 13:08:11 -07:00
Mike Place
c059d6c08c Merge pull request #34176 from rallytime/bp-34103
Back-port #34103 to 2015.8
2016-06-21 13:01:45 -07:00
Mike Place
5cbaaed167 Merge pull request #34179 from terminalmage/issue34114
Raise the correct exception when gitfs lockfile is empty
2016-06-21 13:00:59 -07:00
Mike Place
67deded119 Merge pull request #34178 from terminalmage/remove-comment
Remove unnecesssary comment
2016-06-21 12:15:37 -07:00
Erik Johnson
86d1b8e864 Raise the correct exception when gitfs lockfile is empty
Catching the ValueError around line 416 means that when we re-raise
the exception below, we raise the wrong exception. This commit
explicitly raises the outer-scope exception that we caught above the
block where we attempt to read from the lock file.

Resolves #34114.
2016-06-21 13:48:32 -05:00