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
76,449 Commits 24 Branches 182 Tags 341 MiB
4991c922ae
Commit Graph

76449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Cook
48c4ee6f31 tmp file clean up in file.manage - fix for #33708 2016-12-03 01:15:59 -05:00
Michael Lustfield
82d2b89e0c Rolling back unit test. 
Sorry, I just don't have the time to learn all of this right now.
 2016-12-02 20:26:00 -06:00
Michael Lustfield
b3edbcfd05 Adding larger and more complete debian_ip unit test. 2016-12-02 18:59:27 -06:00
Michael Lustfield
3afd7b6cf4 Adding the valid/documented 'slaves' option. 
This /should/ be possible, but will be stripped.

iface bond0 inet manual
        slaves eth0 eth1
 2016-12-02 18:45:01 -06:00
rallytime
eb372b27d8 Add missing "not" statement: The last syndic test should assertFalse() 2016-12-02 16:53:39 -07:00
rallytime
74a417e527 Update the mocked cloud configs to also include master configs 
The master configs are injected into the cloud configs, and we need
them here in order to get the `user` default for the parsers test.
 2016-12-02 15:38:53 -07:00
rallytime
f2c8cb13d0 Better merge conflict resolution from the initial merge 2016-12-02 15:37:53 -07:00
Michael Lustfield
b6b1adc091 Typo: missing closing parenthesis 2016-12-02 14:57:12 -06:00
rallytime
4e10f8e018 Call exec_test for the Syndic daemon in tests.unit.daemons_test.py 2016-12-02 13:08:41 -07:00
Mike Place
9cd42b9b3f Merge pull request #38039 from rallytime/fix-37939 
Check to see if a line is already commented before moving on
 2016-12-02 13:08:35 -07:00
Mike Place
a34a763984 Merge pull request #38045 from terminalmage/issue38037 
yumpkg.py: don't include non-upgrade versions found by "yum list available"
 2016-12-02 13:07:38 -07:00
rallytime
c1ceeca3d3 Remove initdb dependency in postgres module 
The initdb dep was removed in #37993 to fix #37935, but was
subsequently (likely accidentally) added back to the module
in PR #38023.
 2016-12-02 13:03:20 -07:00
Michael Lustfield
756e41caf2 Fixing a typo; line should not be commented 
Commit b2fa638d6d added a lot of extra options. One of these lines (hwaddr) was commented out when it was added. It appears that this was a typo because documentation indicates this line /should/ show up in the interfaces file.
 2016-12-02 13:50:16 -06:00
Michael Lustfield
32a1374748 Corrects expected return value 
Tests were failing because _parse_interfaces is returning the correct data per mocked data. The assertion was expecting the iface line to have been stripped.
 2016-12-02 13:34:31 -06:00
Michael Lustfield
88f9d9f22c Mostly whitespace & comment changes 
Added a check to make sure inet6 iface lines have the variables needed to prevent a render error.

Also added some whitespace and jinja comment blocks to more easily identify what's going on in this file.
 2016-12-02 13:21:32 -06:00
rallytime
8fd53a4808 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/cloud/vsphere.rst
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/templates/rh_ip/network.jinja
  - salt/utils/parsers.py
  - tests/unit/daemons_test.py
 2016-12-02 12:18:18 -07:00
Mike Place
1ac53e5196 Merge pull request #38004 from terminalmage/issue37969 
Fix regression in user/group mgmt for archive.extracted
 2016-12-02 11:28:48 -07:00
Mike Place
65a0f102fd Add/remove newlines 
Needed for the lint check to pass.
 2016-12-02 11:27:06 -07:00
rallytime
1da7aacfbe Update unit tests to account for additional file.search call 
Also removed some mocks that were not needed anymore for the
calls to ``file.contains_regex_multiline`` because that function
is no longer called in the state file.
 2016-12-02 11:22:10 -07:00
Erik Johnson
65289503d9 Simplify logic for matching desired pkg arch with actual pkg arch 2016-12-02 12:14:13 -06:00
Erik Johnson
3babbcda94 yumpkg.py: don't include non-upgrade versions found by "yum list available" 2016-12-02 12:14:13 -06:00
Mike Place
e90cbbef08 Merge pull request #38051 from Ch3LL/fix_hash_docs 
add docs for hash_type change to sha256
 2016-12-02 11:11:36 -07:00
Michael Lustfield
41ffb8d805 Removing redundant line 
After looking at this a bit more closely, I believe "interface.address" was meant to be "interface.addrfam" which /does/ make sense on this line.

Because of the previous notion that all interfaces will have an address, it seems a second line was created that assumed the only scenario where an iface won't have an address is when dhcp is used. Again, not an accurate assumption. I believe this /should/ handle most expected situations.
 2016-12-02 12:06:59 -06:00
Mike Place
723699fda9 Merge pull request #38047 from cloudflare/NETCONFIG-STATE 
New state: netconfig
 2016-12-02 09:41:32 -07:00
Ch3LL
e95f88fbe3 add docs for hash_type change to sha256 2016-12-02 09:28:50 -07:00
Mircea Ulinic
3375e5fe30
netconfig state doc 2016-12-02 13:27:44 +00:00
Mircea Ulinic
80a76bb78f
New state: netconfig 2016-12-02 12:23:09 +00:00
Iddo Cohen
7e8f144beb Deleted licence and changed tabs 2016-12-02 11:11:34 +01:00
Mike Place
e4c5c29b28 Remove trailing whitespace 2016-12-02 02:50:56 -07:00
Mike Place
1b52289508 Merge pull request #38028 from terminalmage/issue38000 
Pass full_return to saltutil.runner
 2016-12-02 02:49:31 -07:00
kstreee
9103878c4f Fixes blocking waiting through implementing a socket pool class. 2016-12-02 18:47:33 +09:00
Robin Björklin
171cab1726 Fixed possible incorrect behavior if target wasn't on start/end of str 2016-12-02 10:47:26 +01:00
Mike Place
03e0fd39d1 Merge pull request #37963 from terminalmage/tgt_type 
Deprecate expr_form argument in the LocalClient
 2016-12-02 02:45:16 -07:00
Mike Place
41c44ff684 Merge pull request #38044 from terminalmage/issue37980 
Remove debugging code
 2016-12-02 02:43:44 -07:00
Erik Johnson
f70a0409b3 Remove debugging code 
This was left in to debug per-saltenv config overlays. I thought I had
removed it weeks ago, but I guess I didn't, and it made it into
2016.11.0. This commit removes the debugging code.
 2016-12-01 23:20:01 -06:00
Michael Lustfield
3a8168667b Ensure iface_dict not being populated will not produce a stacktrace 
I wouldn't consider this a complete solution, for the reason left in the comment, but it /does/ at least help.
 2016-12-01 21:55:52 -06:00
Michael Lustfield
4de2cb2805 Corrects regression in debian_ip/debian_eth.jinja 
Not all interfaces will have an address. Bug #38042
 2016-12-01 21:43:50 -06:00
rallytime
8a685b1820 Check to see if a line is already commented before moving on 
Fixes #37939
 2016-12-01 16:52:56 -07:00
rallytime
f2c045520d Write an integration test demonstrating the issue 2016-12-01 16:52:03 -07:00
Rita Zhang
e3eeacd5aa Allow NSG to be assigned to a new NIC for Azure ARM 
* Add support for attaching network security group to a new network interface
* Add check for security_group in the configuration file
 2016-12-01 14:50:42 -08:00
Mike Place
6724fe4871 Modify daemons test to use multiprocessing (#38034) 
* Modify daemons test to use multiprocessing

Without this approach, instantiating a master/minion from this test
would affect the parser tests down the line.

* Fix typo

* Fix copy/paste error

* Add missing attr
 2016-12-01 15:33:36 -07:00
Mike Place
9661258f22 Merge pull request #38035 from dmurphy18/fix_debbuild 
Updated to return status from make_repo similar to rpmbuild.py
 2016-12-01 15:30:53 -07:00
Erik Johnson
94a16ada7b Replace usage of deprecated expr_form in tests 2016-12-01 16:21:49 -06:00
Mike Place
47956ffd0c Merge pull request #38014 from StreetHawkInc/develop 
Fix 'changes' for pip.installed from requirements
 2016-12-01 15:14:18 -07:00
Mike Place
ebd09bcab4 Merge pull request #38008 from m03/aptpkg-pylint-fixes_1 
Fix several minor linting issues with aptpkg in develop
 2016-12-01 15:12:25 -07:00
Mike Place
141b5c5656 Merge pull request #38023 from gtmanfred/2016.11 
Expand error message for postgres states
 2016-12-01 15:05:06 -07:00
Mike Place
faf94a10a0 Merge pull request #38030 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-12-01 15:03:32 -07:00
Mike Place
b5d3cee033 Merge pull request #38031 from skizunov/develop2 
Windows: Fix exception when certain grains are None
 2016-12-01 15:02:51 -07:00
Mike Place
4f50d8e73c Merge pull request #38033 from terminalmage/update-systemd-mask-tests 
Update systemd module unit tests to reflect new masking behavior
 2016-12-01 15:01:59 -07:00
Erik Johnson
ac2f4e3ab9 Update systemd module unit tests to reflect new masking behavior 2016-12-01 14:21:33 -06:00