valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,320 Commits 24 Branches 182 Tags 341 MiB
e2524656c4
Commit Graph

81320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Maryniuk
181d0780d0 Lintfix 2017-04-22 10:08:19 +02:00
Bo Maryniuk
8e9ce1a68d Move out nested function to be unit-testable 2017-04-22 10:08:19 +02:00
Bo Maryniuk
cd43805770 Add initial unit test for openstack cloud module 2017-04-22 10:08:19 +02:00
Bo Maryniuk
177f31446d Add fake preferred IP function for testing 2017-04-22 10:08:19 +02:00
Bo Maryniuk
d1aeb13ac7 Move out openstack's nested function to be testable 2017-04-22 10:03:46 +02:00
Ch3LL
d1eb2b8e09
fix where clone check happens 2017-04-21 18:16:19 -04:00
rallytime
3898117d6e Update os_family grain to be "Suse" instead of "SUSE" for localemod 
Also update some of the test functions to be a little more clear
 2017-04-21 16:14:50 -06:00
twangboy
46c20c9e89 Improve unicode for win_useradd 2017-04-21 14:25:55 -06:00
Ch3LL
704048be30
add spaces for code in docs 2017-04-21 16:10:31 -04:00
Ch3LL
09f7b3a500
add title 2017-04-21 16:08:52 -04:00
Ch3LL
f0ff969c6a
add ability to expand disk size on creation of vm in nebula 2017-04-21 16:05:18 -04:00
Nicole Thomas
50ddf219a6 Merge pull request #40824 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-21 14:03:10 -06:00
Nicole Thomas
15e39d8978 Merge pull request #40823 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-21 14:02:43 -06:00
Mike Place
767f6650b5 Merge pull request #40786 from bodhi-space/infra4728 
INFRA-4728 - boto3_sns execution and state modules
 2017-04-21 12:10:05 -06:00
Mike Place
26f5482576 Merge pull request #40809 from gtmanfred/develop 
Add zookeeper managing module and state
 2017-04-21 12:04:25 -06:00
Mike Place
b5f67f0750 Merge pull request #40822 from lordcirth/fix-rsync-changes 
rsync.py: Don't return changes when clean
 2017-04-21 12:00:38 -06:00
Mike Place
1b304bb476 Extra space before inline comment 2017-04-21 11:47:02 -06:00
Mike Place
d6e26d18cb Merge pull request #40811 from UtahDave/2016.11local 
get config_dir based off conf_file if __opts__['config_dir'] doesn't exist
 2017-04-21 11:44:41 -06:00
Mike Place
eacf1b364f Merge pull request #40814 from chqian/dev/chqian/fix_opkg_list_pkgs_with_description 
Make pkg.list_pkgs() parse output with description
 2017-04-21 11:42:49 -06:00
Mike Place
ddedf05b7d Merge pull request #40820 from gtmanfred/2016.11 
remove deprecated firstgen rackspace cloud driver
 2017-04-21 11:42:18 -06:00
Super-User
65d638801b Properly parse SDC grains defined in spec 2017-04-21 18:29:30 +02:00
rallytime
f31f9512b8 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-04-21 09:51:31 -06:00
rallytime
a7eb8f717e Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-21 09:50:25 -06:00
Nicole Thomas
a153f5c204 Merge pull request #40783 from xetus-oss/feature-40755 
Add state.orch_show_sls to the state runner
 2017-04-21 09:45:35 -06:00
Super-User
4c6de322d0 Add mdata grains as separate module 2017-04-21 17:28:35 +02:00
Nathan Fish
ea4592de91 rsync.py: Don't return changes when clean 
No longer returns changes when they are "N/A"
Fixes https://github.com/saltstack/salt/issues/37714
 2017-04-21 11:27:54 -04:00
Nicole Thomas
9e9d5ad0a9 Merge pull request #40810 from rallytime/fix-tls-test-failure 
Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict.
 2017-04-21 09:25:44 -06:00
Daniel Wallace
b60a8d013a remove rackspace from index 2017-04-21 09:23:05 -06:00
Daniel Wallace
559aa1d8b6 remove deprecated firstgen rackspace cloud driver 2017-04-21 08:59:56 -06:00
Super-User
ac082f1935 Optimize BrandZ detection and remove mdata grains 
We can use os.uname() to detect if we are running in a LX zone on
SmartOS. This saves us one fork/exec.

The mdata stuff has also been removed from the core grain module.
A seperate grain module will be take it's place. This to improve
the core grains readability and to nicely seperate out the
functionality.
 2017-04-21 16:51:33 +02:00
Petr Michalec
ab1dd446e7
Endpoint handling per region, fixes #35874 
- extend tests for multiple regions
- region arg by default set to None
- print verbose changes to be exec.
 2017-04-21 15:48:52 +02:00
Mike Place
8652ad68c8 Merge pull request #40753 from arno01/dockerng-enhanced 
dockerng: avoid network duplication and add driver_opts
 2017-04-21 05:21:33 -06:00
Dennis Dmitriev
6453bade02 Make _qemu_image_create() more independent 2017-04-21 12:53:39 +03:00
Andrey Arapov
4c29c5f6ab
dockerng: avoid network duplication and add driver_opts 2017-04-21 08:52:55 +02:00
Daniel Wallace
0b70e9405f add zookeeper module and state 
Also use __context__ in zk_conncurrency
 2017-04-20 17:56:05 -06:00
David Boucha
9f6e2e9c92 get config_dir based off conf_file 
get config_dir based off conf_file if config_dir not in __opts__

ZD 1353
 2017-04-20 17:20:19 -06:00
Nicole Thomas
aba6e0bb2d Merge pull request #40807 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-20 17:05:40 -06:00
Nicole Thomas
12345dee7f Merge pull request #40806 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-20 17:05:27 -06:00
rallytime
d5b1241972 Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict 
he pip junos-eznc package, when installed with PyOpenSSL version 0.14 causes
this test failure. If you either remove junos-eznc, or upgrade PyOpenSSL
(current is 0.17) the test is happy. So, we need to handle this case in the test.
 2017-04-20 17:02:33 -06:00
rallytime
615448a3f3 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/utils/s3.py
 2017-04-20 13:47:02 -06:00
rallytime
55c947adf4 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-20 13:44:37 -06:00
Nicole Thomas
2ab42489df Merge pull request #40797 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-20 13:42:03 -06:00
Nicole Thomas
ced839f841 Merge pull request #40800 from rallytime/bp-40720 
Back-port #40720 to 2016.11
 2017-04-20 13:41:40 -06:00
Nicole Thomas
4914486067 Merge pull request #40802 from rallytime/fix-pkgrepo-test-failure 
Update managed.sls test file: osmajorrelease grain is an int now
 2017-04-20 13:35:01 -06:00
Erik Johnson
b8ebeda35b Alias moby to docker in Nitrogen (and later) 2017-04-20 14:30:06 -05:00
Nicole Thomas
10764b7f2e Merge pull request #40799 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-20 12:43:35 -06:00
Nicole Thomas
665678526d Merge pull request #40798 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-20 12:42:53 -06:00
rallytime
bad421be66 Update managed.sls test file: osmajorrelease grain is an int now 
We need to make the comparison in the file to `7` instead of `'7'`,
otherwise the state doesn't execute correctly and the test_pkgrepo
test will fail because the state didn't run.
 2017-04-20 12:27:45 -06:00
Mike Place
ba2e7dd4f6 Merge pull request #40697 from DSRCorporation/bugs/35691_cache_full_ret 
Keep all return-related values in the job cache.
 2017-04-20 11:57:27 -06:00
Tom Williams
9756c86ea8 INFRA-4728 - docstring fix 2017-04-20 13:54:07 -04:00