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
66,280 Commits 24 Branches 182 Tags 341 MiB
14ddae0aa8
Commit Graph

66280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hobley
14ddae0aa8 Fixed installing keychain certificates from salt fileserver 2016-03-09 18:16:47 -06:00
Nicole Thomas
5424159604 Merge pull request #31707 from sjorge/2016.3-top 
Fix incorrect default types for master_tops and file_ignore_regex
 2016-03-09 16:33:26 -07:00
Nicole Thomas
2feee850ca Merge pull request #31725 from techhat/issue31681 
Ensure that vm_details is a dict
 2016-03-09 15:56:09 -07:00
Nicole Thomas
12c8e5a68e Merge pull request #31730 from thatch45/fix_flodir 
fix bug introduced by moving config into directory
 2016-03-09 11:37:56 -07:00
Nicole Thomas
f1c8e54135 Merge pull request #31746 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-03-09 11:37:43 -07:00
Nicole Thomas
5b9c384562 Merge pull request #31753 from rallytime/bp-31694 
Back-port #31694 to 2016.3
 2016-03-09 10:57:26 -07:00
rallytime
46d29e7594 Fix daemons test logger --> log references 2016-03-09 10:51:07 -07:00
Brian Jackson
47a865170e Add private_ips to list_nodes_full for vultrpy.py 
Add private_ips to list_nodes_full for vultrpy.py
 2016-03-08 13:24:50 -07:00
rallytime
c9aabb429e Pylint is being weird... 2016-03-08 13:11:11 -07:00
rallytime
f9d139cc3c Pylint Fix 2016-03-08 10:58:37 -07:00
rallytime
afdb19a307 Resolve merge conflicts in salt/cli/daemons.py 2016-03-08 10:31:21 -07:00
rallytime
838dc12b77 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/exceptions.py
  - salt/pillar/foreman.py
  - salt/returners/local_cache.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py

The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
 2016-03-08 10:14:32 -07:00
Thomas S Hatch
e5da261c71 fix bug introduced by moving config into directory 2016-03-07 15:35:50 -07:00
Mike Place
826fea6582 Merge pull request #31162 from isbm/isbm-md5-to-sha1 
Remove MD5 digest from everywhere and default to SHA256
 2016-03-07 12:11:36 -07:00
Mike Place
a1f32b71bd Merge pull request #31670 from terminalmage/issue30528 
Write lists of minions targeted by syndic masters to job cache
 2016-03-07 11:51:52 -07:00
Mike Place
24568b1a5d Merge pull request #31711 from ticosax/fix-port-and-volume-discovery 
[dockerng] Port and Volume comparison should consider Dockerfile
 2016-03-07 11:25:19 -07:00
Mike Place
b936e09fb3 Merge pull request #31719 from techhat/issue31579 
Don't worry about KeyErrors if the node is already removed
 2016-03-07 11:16:40 -07:00
Joseph Hall
992e749f19 Ensure that vm_details is a dict 2016-03-07 11:00:07 -07:00
Joseph Hall
88905095c9 Don't worry about KeyErrors if the node is already removed 2016-03-07 08:59:53 -07:00
Mike Place
604eb87e82 Merge pull request #31713 from ticosax/fix-dockerng-networking-container_id 
[dockerng] Fix dockerng.network_present when container is given by name
 2016-03-07 08:14:41 -07:00
Mike Place
b8ae54dbe2 Merge pull request #31693 from twangboy/mac_timezone 
mac_timezone to use mac_utils
 2016-03-07 07:48:48 -07:00
Mike Place
d7401e9ea4 Merge pull request #31691 from rallytime/bp-31261 
Back-port #31261 to 2016.3
 2016-03-07 07:44:13 -07:00
Mike Place
3f54f4c73a Merge pull request #31703 from vitaliyf/patch-1 
Fixed typos in beacons/memusage.py comments and logging
 2016-03-07 07:43:52 -07:00
Mike Place
8f28e4510d Merge pull request #31705 from peripatetic-sojourner/foreman_pillar 
Foreman pillar
 2016-03-07 07:24:58 -07:00
Nicolas Delaby
3837cf44ca Fix network_present by dealing with containers ID's instead of names. 
Because docker inspect network returns attached containers by their Ids.
 2016-03-07 10:30:58 +01:00
Nicolas Delaby
cf38691597 Port and Volume comparison should consider Dockerfile 
`EXPOSE` and `VOLUME` declaration of a Dockerfile are exactly like
user declaration those parameters in their sls for dockerng.running

Considering Dockerfile containing this line:

```
EXPOSE 80
```

Those 2 sls are now considered strictly equivalent.

```yaml
container:
    dockerng.running:
      image: alpine
      ports:
        - 80/tcp
```

```yaml
container:
    dockerng.running:
      image: alpine
```
 2016-03-07 10:11:52 +01:00
Matthew Cillo
ba33d75949 passing lint test 2016-03-06 17:19:08 -05:00
Jorge Schrauwen
42b8056408 fix Key file_ignore_regex with value [...] has an invalid type of list 2016-03-06 21:00:57 +00:00
Jorge Schrauwen
48d9e7a800 fixes "Key master_tops with value {} has an invalid type of dict" mentioned in #31563 2016-03-06 20:56:49 +00:00
Matthew Cillo
63e39a8999 refactored parameter population for foreman pillar 2016-03-06 15:51:47 -05:00
Matthew Cillo
c3325bc15d add return of virtualname 2016-03-06 15:51:25 -05:00
C. R. Oldham
aa5c13f0b8 Merge pull request #31702 from rallytime/merge-2015.8 2016-03-06 12:24:46 -07:00
Vitaliy Fuks
932c7d8099 Fixed typos in beacons/memusage.py comments and logging 2016-03-06 14:07:24 -05:00
rallytime
6559ea15b0 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/glossary.rst
  - salt/config.py
  - tests/unit/modules/gpg_test.py
 2016-03-06 10:59:46 -07:00
Nicole Thomas
ace290629e Merge pull request #31700 from s0undt3ch/2015.8 
It's a function!
 2016-03-06 10:33:58 -07:00
Nicole Thomas
42868804fb Merge pull request #31699 from sjorge/2016.3-smartos-esky 
drop M2Crypto from the SmartOS esky builds
 2016-03-06 10:31:45 -07:00
Pedro Algarvio
1ca2beea3e
It's a function! 2016-03-06 01:45:14 +00:00
Jorge Schrauwen
8077fe3e19 drop M2Crypto from the SmartOS esky builds 2016-03-05 23:43:18 +00:00
Erik Johnson
65e5a3c53e Pass syndic_id to save_minions() 2016-03-05 01:02:31 -06:00
Erik Johnson
cf94c2597a Add argument to save_minions() to pass a syndic ID 
This is used to provide a unique filename for the minion list for a
given syndic.
 2016-03-05 01:02:31 -06:00
Erik Johnson
cb92114377 Add syndic_id param for API compatibility 
Also fix successive updates
 2016-03-05 01:02:31 -06:00
Erik Johnson
1d39eec69b Skip events with minion lists but no jid 
Some events just contain a timestamp and a minion list, but no jid.
These can safely be ignored, lest they cause supurious log messages.

Also, pass the syndic's id so that it can be stored in a unique file in
the job cache (in the local_cache returner).
 2016-03-05 01:01:25 -06:00
twangboy
565d2159c8 Fix some lint 2016-03-04 18:05:13 -07:00
twangboy
ba955dcbb2 Use full path to salt.utils.mac_utils 2016-03-04 17:18:33 -07:00
Nicole Thomas
d7914cdb14 Merge pull request #31687 from cachedout/rm_gpg_test 
Removed useless GPG tests
 2016-03-04 17:08:27 -07:00
twangboy
10e42f9a5d Fix missing mac_utils 2016-03-04 17:06:02 -07:00
twangboy
b19927d4b3 Use explicit declaration for mac_utils functions 2016-03-04 16:57:33 -07:00
twangboy
75546eadaf Fix tests for mac_utils 2016-03-04 16:36:02 -07:00
twangboy
7bed7c3fb8 Fix some errors in mac_utils 2016-03-04 16:14:02 -07:00
twangboy
41230acf34 Change mac_utils to call timedProc directly 2016-03-04 16:14:02 -07:00