valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,465 Commits 24 Branches 182 Tags 341 MiB
cc4d958557
Commit Graph

69465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
5789ea99cf Force string 2016-09-16 14:42:22 -06:00
twangboy
6c5bd7664b Fix join syntax 2016-09-16 14:41:35 -06:00
twangboy
ac8610d523 Add ServicePack to osrelease 2016-09-16 14:36:05 -06:00
Aditya Kulkarni
5737b1c409 Update versionadded and release notes (#36352) 2016-09-16 14:33:32 -06:00
Daniel Wallace
70e7f6d58b cache query args with url as well 
Without this, we can't use query args to get the hash of a file or add
query args to change what a file returns
 2016-09-16 15:32:45 -05:00
Nicole Thomas
495d365e54 Merge pull request #36369 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-16 10:31:14 -06:00
puneet kandhari
3ac308ac76 Update aptpkg.py 2016-09-16 11:22:11 -05:00
rallytime
37aea4188a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-16 09:24:17 -06:00
Thomas S Hatch
40b2e3d189 Merge pull request #36353 from rallytime/refresh-db-cleanup 
Check for Ign/Hit membership instead of == in aptpkg.refresh_db
 2016-09-16 09:20:30 -06:00
Nicole Thomas
df9d9b3624 Merge pull request #36355 from rallytime/bp-36288 
Back-port #36288 to 2015.8
 2016-09-16 08:59:47 -06:00
Denys Havrysh
3f308d7694 postgres_extension: report changes when an extension was installed (#36335) 
* postgres_extension: report changes when extension was installed or upgraded

* postgres_extension state: fix unit tests
 2016-09-16 08:23:20 -06:00
twangboy
92034936c1 Fix windows grains for os 2016-09-15 17:46:16 -06:00
Mike Place
70ffdafbf0 Schema test requires jsonschema 2.5.0 or above 2016-09-15 17:23:51 -06:00
rallytime
275319193a Check for Ign/Hit membership instead of == in aptpkg.refresh_db 2016-09-15 16:46:28 -06:00
Michael Stella
ba60b7972a Additional documentation. 2016-09-15 17:22:08 -04:00
Michael Stella
8b877f014d 'All' grants for PostgreSQL. 
This update allows granting privileges on ALL tables or ALL sequences
in a given schema.  Such as:

GRANT SELECT ON ALL TABLES IN SCHEMA public TO 'monkey';
 2016-09-15 17:22:08 -04:00
Michael Stella
fbbe9ec571 Quote postgres privilege target names (#36249) 
* Quote postgres privilege target names

Postgres lets you put characters in table/database names which you then must
quote.  So we should always quote.

* Updating unit tests

* Also quote role names.

Role names can also have dashes (or others) in them, so we must also quote
them.
 2016-09-15 15:12:41 -06:00
Julien Cigar
9451141b3f set __virtualname__ to 'service' (#36330) 2016-09-15 14:53:09 -06:00
Thomas S Hatch
d2a583bc22 Merge pull request #36337 from cachedout/conduct 
SaltStack's code of conduct
 2016-09-15 14:44:25 -06:00
Julien BONACHERA
fee3be4d26 Use infoblox_* values if present in arguments (#36339) 2016-09-15 14:42:02 -06:00
Erik Johnson
ef128ad0b0 Return None when find_file identifies the path as a directory (#36342) 
This fixes a traceback in the LocalClient when you try to use
cp.cache_file on a directory instead of a file.
 2016-09-15 14:39:46 -06:00
Daniel Wallace
19eb84860e remove help message from glance module (#36345) 2016-09-15 14:38:42 -06:00
Nicole Thomas
a4bbd5e3d7 Add resize2fs unit test from blockdev_test to disk_test (#36346) 
The blockdev module is being slowly deprecated and its functions moved to
to the disk module instead. There is a test for resize2fs in the blockdev_test
file in the 2015.8 branch (which matches the resize2fs function in the blockdev
module), but this function was moved to the disk file in 2016.3. The test was
never moved over.

I discovered this during a merge forward in #36344. This PR adds the
test from 2015.8 blockdev_test to the 2016.3 disk_test.py, and is adjusted
to work with the disk module accordingly.
 2016-09-15 14:37:53 -06:00
Erik Johnson
f09c3e499f Merge pull request #36350 from terminalmage/docs 
Add note about yumpkg.check_db removal in Boron
 2016-09-15 15:32:31 -05:00
Erik Johnson
b815c98577 Add note about yumpkg.check_db removal in Boron 
Resolves #36292.
 2016-09-15 15:30:07 -05:00
puneet kandhari
892cc4cd48 Update aptpkg.py 2016-09-15 12:48:58 -05:00
Nicole Thomas
a33da842c0 Merge pull request #36344 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-15 11:38:57 -06:00
rallytime
d1f560147d Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/modules/blockdev_test.py
 2016-09-15 11:37:56 -06:00
puneet kandhari
cbe98d97a3 Fix pylint whitespace errors 2016-09-15 11:48:45 -05:00
Pablo Suárez Hernández
dc518c5340 Skip test_resize2fs if resize2fs does not exists (#36325) 2016-09-15 10:14:50 -06:00
Andrew Hammond
3a37fe5df9 merge error overwrites correct ssh_host with stale data in ip_address (#36312) 2016-09-15 10:00:30 -06:00
Mike Place
2fb61b9c9f SaltStack's code of conduct 2016-09-16 00:32:01 +09:00
puneet kandhari
e5371ac720 No force_yes parameter to pkg.upgrade #21248 
We have a case for force_yes and skip_verify when upgrade
 2016-09-14 18:45:05 -05:00
Thomas S Hatch
083f1d998a Fix bug where the client will destroy the loop 2016-09-14 15:19:17 -06:00
Nicole Thomas
6a3019bbf1 Merge pull request #36299 from rallytime/gate-pkg-group-installed-test 
Gate the pkg.group_installed state test: not all pkg modules have group_install
 2016-09-14 13:04:26 -06:00
rallytime
9e15df9b23 Switch the order of the decorator 
When @requires_system_grains is listed before other decorators, wrapper
function gets confused on where the grains kwarg should go.
 2016-09-14 12:12:21 -06:00
Nicole Thomas
b3aac0ec20 Back-port #36273 to 2016.3 (#36295) 
* Add append_newline flag for #33686 (#36273)

* Add versionadded tag to new append_newline option
 2016-09-14 10:58:16 -06:00
Nicole Thomas
729617923e Back-port #36124 to 2016.3 (#36296) 
* Use /etc instead of /root

* Skip test on anything but linux

* Add missing import (lint)
 2016-09-14 10:08:16 -06:00
Nicole Thomas
a8a72c985f Merge pull request #36297 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-14 10:07:30 -06:00
Mike Place
ee997be6d8 Fix pkg group test by passing a list instead of str 
Refs  integration.states.pkg.PkgTest.test_group_installed_handle_missing_package_group
 2016-09-14 09:53:10 -06:00
rallytime
c7d8867096 Gate the pkg.group_installed state test: not all pkg modules have group_install 
Refs #35907
 2016-09-14 09:25:56 -06:00
Mike Place
7684ebd0e7 Filter out pub kwargs from cloud runner (#36178) 
* Filter out pub kwargs from cloud runner

* Fix typo

* Proper function unpacking
 2016-09-14 09:18:09 -06:00
rallytime
e2f1cf6025 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-14 09:10:05 -06:00
Mike Place
fc7a1d536f Merge pull request #36238 from pass-by-value/vmware_clone_from_snapshot 
Add ability to clone from a snapshot to salt-cloud vmware driver
 2016-09-14 14:31:50 +09:00
Mike Place
b9b8e45362 Merge pull request #36272 from terminalmage/improved-gitfs-logging 
Improved gitfs/git_pillar error logging
 2016-09-14 14:25:16 +09:00
Mike Place
abb6aacb4b Merge pull request #36277 from terminalmage/gitfs-check-key-path 
salt.utils.gitfs: Check for existence of ssh keys
 2016-09-14 14:22:37 +09:00
Erik Johnson
223a20e987 Improved gitfs/git_pillar error logging 
This adds ``exc_info_on_loglevel`` kwargs to error logging when the
error is being logged within an ``except`` block, to aid in
troubleshooting.
 2016-09-13 16:51:20 -05:00
Pablo Suárez Hernández
ed2d2bd331 Integration tests fixes for 2015.8 (#36262) 
* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
 2016-09-13 15:24:06 -06:00
Erik Johnson
4fee18c820 salt.utils.gitfs: Check for existence of ssh keys 
This adds a check for existence of the public and private keys, and
will raise an exception if they do not exist.

The git_pillar preflight checks have also been altered to try to init
the git_pillar repos, instead of just instantiating a GitPillar object.
This will cause invalid git_pillar configuration to keep the master from
starting up like we already do for gitfs.
 2016-09-13 14:52:52 -05:00
Pablo Suárez Hernández
a0bbb0f648 Integration tests fixes for 2016.3 (#36263) 
* Fix PillarModuleTest::test_pillar_items: 'info' does not exist in pillar

* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
 2016-09-13 12:40:56 -06:00