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,580 Commits 24 Branches 182 Tags 341 MiB
0e7f35e7b8
Commit Graph

76580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth House
15826ca207 Add integration test for checking the type of the __sls__ field 
We should add a bunch more of these for other fields. Or we should just
use Typings to define the return from the state functions. ^_^
 2016-12-05 14:08:20 -07:00
Seth House
e4cf3931b3 Add integration test for the running dictionary structure 
This will fail if we remove/rename any fields from the running
dictionary by accident.
 2016-12-05 14:08:20 -07:00
Iddo Cohen
ebbbf3f90c Adding str() for raw lines 2016-12-05 21:47:17 +01:00
Iddo Cohen
13f494cc12 Fixing PEP8 Errors 2016-12-05 21:43:30 +01:00
Andreas Tsaridas
f59ce3a2cf - remove comments 2016-12-05 21:41:25 +01:00
Andreas Tsaridas
69a0023a21 - change name and type of the config option 2016-12-05 21:41:20 +01:00
Andreas Tsaridas
342ca788db - add option for syndics to forward all events to all masters 2016-12-05 21:41:15 +01:00
Michael Lustfield
81cb688d4c Better check for dual stack. 2016-12-05 14:34:41 -06:00
Mike Place
78295516e7 Merge pull request #37878 from kstreee/2016.11 
Makes threads avoid blocking waiting while communicating using Zeromq.
 2016-12-05 12:50:46 -07:00
Mike Place
0809ccd429 Merge pull request #37987 from rbjorklin/consul-pillar-target 
consul_pillar support for limiting pillar exposure via minion targeting
 2016-12-05 12:48:20 -07:00
Mike Place
54ed167645 Merge pull request #38038 from ritazh/azurearmpr 
Allow NSG to be assigned to a new NIC for Azure ARM
 2016-12-05 12:35:05 -07:00
Mike Place
dd60542808 Merge pull request #31662 from dkiser/ipt_flex_out 
Proposed feature implementation for #31661
 2016-12-05 12:33:44 -07:00
twangboy
978af6d83c Remove only .sls files from the cached winrepo-ng 2016-12-05 12:24:16 -07:00
Mike Place
e8f7b8fe29 Merge pull request #38074 from alexbleotu/get_datacenters_gh 
Get datacenters gh
 2016-12-05 11:59:49 -07:00
Mike Place
03069fe3f2 Merge pull request #38063 from llua/tmp_files_cleanup 
tmp file clean up in file.manage - fix for #33708
 2016-12-05 09:41:01 -07:00
Mike Place
83dcfe81ea Merge pull request #38067 from terminalmage/issue38062 
Remove virtual funcs for archive state/module
 2016-12-05 09:37:23 -07:00
Mike Place
fb984566d0 Merge pull request #37834 from ClaudiuPID/adds-icinga2-support 
Icinga2 module and state draft proposal.
 2016-12-05 08:59:01 -07:00
Alexandru Bleotu
2f428ef38f Added tests for utils.vmware.get_datacenter 2016-12-05 10:38:11 -05:00
Alexandru Bleotu
50174acfbd Updated utils.vmware.get_datacenter to use utils.vmware.get_datacenters 2016-12-05 10:38:11 -05:00
Alexandru Bleotu
e8a854f9ac Added tests for utils.vmware.get_datacenters 2016-12-05 10:37:48 -05:00
Robin Björklin
5d0454a7ca Ignore W1401 (anomalous-backslash-in-string) 2016-12-05 13:41:47 +01:00
Alexandru Bleotu
364b6eb394 Added utils.vmware.get_datacenters which returns all datacenters in a vCenter 2016-12-05 07:24:12 -05:00
Robin Björklin
2e929a5ecc Linting fixes 2016-12-05 11:13:45 +01:00
Erik Johnson
2e0f26a084 Remove virtual funcs for archive state/module 
Since not all funcs require the CLI commands, the better way of handling
this is to check for presence of the needed funcs and gracefully exit a
state when the function is not present.
 2016-12-04 23:31:51 -06:00
Michael Lustfield
525c746274 May Cthulhu take mercy on my soul for this commit. 
This is a bit of a refactor that may need to come with a documentation
update as well. It appears our previous authors made a few assumptions
for the sake of simplicity. Thankfully, they were nice enough to write
the rest of the system to be flexible enough for me to wedge this in.

I rewrote this so that it can handle an interface having v4-only,
v6-only, or v4-and-v6 addresses assigned. It's possible some options I
copied into the V6IF block are not valid inet6 options, but these can be
removed as needed

An IPv6 interface can have any number of IPv6 addresses attached to it,
this will also need to be included.
 2016-12-04 20:47:27 -06:00
Michael Lustfield
300ca6047e I guess this makes the previous commit a bit redundant, but I'm not sure if I want to remove it. 2016-12-04 00:04:58 -06:00
Michael Lustfield
6e7fc39c68 This now seems absurdly obvious, but I'm not ruling out that I'll break everything. 2016-12-03 23:50:10 -06:00
Mike Place
c9933670f9 Merge pull request #38058 from rallytime/remove-init-db-dep 
Remove initdb dependency in postgres module
 2016-12-03 21:19:01 -07:00
Mike Place
9dcfdeef6b Merge pull request #38059 from rallytime/daemons-test-fix 
Call exec_test for the Syndic daemon in tests.unit.daemons_test.py
 2016-12-03 21:18:41 -07:00
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
Seth House
0af51fd086 Add the __sls__ field to the highstate output (the running dict) 
There's a bunch of cool info in the running dictionary that is useful
for summarizing a state run. I'd like to be able to show 'N states from
M files' as well.
 2016-12-02 11:48:34 -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