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,585 Commits 24 Branches 182 Tags 341 MiB
4302adb1fd
Commit Graph

66585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
67ab3f01a7 Use mac_utils functions 2016-03-04 16:14:02 -07:00
Gareth J. Greenaway
820fb9551a when using splay, seconds was being included in listing for schedule items that didn't original include it. This PR fixes that scenario. 2016-03-04 16:12:41 -07:00
Sergey Paramonov
1f8f4cb99b Update module.py 
using module.run to check if port 53 is opened on localhost, using module network.connect  
example state: 
~~~
network.connect:
  module.run: 
    - host: {{ salt['network.ipaddrs']()|join }}
    - port: 53
    - port: 1234
    - proto: udp

unexpected behavior: 
module.run will always succeed, 
even If network.connect returns result: False

example output (before the change): 
----------
          ID: network.connect
    Function: module.run
      Result: True
     Comment: Module function network.connect executed
     Started: 22:28:29.475623
    Duration: 0.001 ms
     Changes:   
              ----------
              ret:
                  ----------
                  comment:
                      Unable to connect to 10.0.0.50 (10.0.0.50) on tcp port 1234
                  result:
                      False

Proposal: 
Proposing to check changes_ret.result and return it as a result before trying to check changes_ret.retcode 

tested expected behavior: 
~~~
----------
          ID: network.connect
    Function: module.run
      Result: False
     Comment: Module function network.connect executed
     Started: 22:50:25.149832
    Duration: 9.964 ms
     Changes:   
              ----------
              ret:
                  ----------
                  comment:
                      Unable to connect to 10.0.0.50 (10.0.0.50) on tcp port 1234
                  result:
                      False

----------
          ID: network.connect
    Function: module.run
      Result: True
     Comment: Module function network.connect executed
     Started: 22:50:07.129629
    Duration: 0.205 ms
     Changes:   
              ----------
              ret:
                  ----------
                  comment:
                      Successfully connected to 10.0.0.50 (10.0.0.50) on tcp port 53
                  result:
                      True
 2016-03-04 15:55:14 -07:00
Mike Place
8b00513ebb Removed useless tests 
These test nothing and break everytime the underlying implementation is changed.
 2016-03-04 15:37:49 -07:00
Seth House
26479bee24 Clean up the SMTP returner docstring and show an actual config example 
This is a frequent stumbling block for users unaccustomed to the older
`mod.setting` configuration syntax. Often they will interpret the list
of settings as needing to be underneat a top-level `smtp` dictionary.

This has been on my todo list for a looong time. :-P
 2016-03-04 15:09:56 -07:00
Mike Place
df54519776 Merge pull request #31656 from twangboy/mac_utils_tests 
Mac utils tests
 2016-03-04 15:04:04 -07:00
Seth House
74563f17ed Make sure the email subject and body are strings 
compile_template returns StringIO objects.
 2016-03-04 14:44:14 -07:00
Seth House
fc69d08e8e Default to just 'jinja' for the SMTP renderer 
YAML doesn't make sense here since we're just rendering a text email.
The user can still override in the smtp renderer settings if the user
has complex needs.
 2016-03-04 14:44:14 -07:00
Seth House
2af7cd2789 Add missing 'port' to smtp options 2016-03-04 14:44:01 -07:00
Nicole Thomas
cf438aa873 Merge pull request #31679 from cro/proxy_contrib_doc_fix 
Fix bad link to the sample REST endpoint in salt-contrib.
 2016-03-04 14:05:50 -07:00
Mike Place
bd4d12a155 Merge pull request #31660 from terminalmage/issue31619 
Remove epoch from version string if present when installing with yum
 2016-03-04 13:49:23 -07:00
Mike Place
97127a8b83 Merge pull request #31668 from rallytime/testing-docs 
Some more testing documentation improvements
 2016-03-04 13:48:57 -07:00
Mike Place
e33c1f456a Merge pull request #31683 from rallytime/bp-31578 
Back-port #31578 to 2015.5
 2016-03-04 13:47:41 -07:00
Nicole Thomas
86a7676172 Merge pull request #31665 from sjorge/2016.3-smartos 
Add some info about improvements for SmartOS, illumos, and So…
 2016-03-04 13:42:18 -07:00
Nicole Thomas
27f443895d Merge pull request #31682 from cachedout/cache_meaning 
Add definition of job cache to glossary
 2016-03-04 13:07:19 -07:00
Andreas Lutro
8fe46789b7 allow queueing of state runs through saltmod 2016-03-04 12:56:51 -07:00
Mike Place
a75e146125 Add definition of job cache to glossary 2016-03-04 12:41:02 -07:00
rallytime
beb9d0fe84 Ensure all integration test classes and funcs are documented w/examples 2016-03-04 12:13:27 -07:00
twangboy
6cf7a4b364 Add missing import 2016-03-04 10:55:23 -07:00
twangboy
5d6de86a25 Fix some lint 2016-03-04 10:53:11 -07:00
twangboy
88d5db9cdd Add tests for remaining functions 2016-03-04 10:53:11 -07:00
twangboy
69aa8f8cbf Add test for execute_return_success 2016-03-04 10:53:11 -07:00
Erik Johnson
651e3926f7 lint fixes 2016-03-04 10:59:45 -06:00
rallytime
7f8ebf7c97 Found another spelling error 2016-03-04 09:53:35 -07:00
rallytime
c8c188535f Spelling fix 2016-03-04 09:33:37 -07:00
C. R. Oldham
d638971b73 Correct url to salt-contrib 2016-03-04 09:06:10 -07:00
Erik Johnson
0f175a4edf salt.returners.sqlite3_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
f8664103b1 salt.returners.redis_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
0ea1b76c22 salt.returners.postgres_local_cache: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
d6d794b484 salt.returners.postgres: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
82750ab699 salt.returners.pgjsonb: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
d8f90f6578 salt.returners.odbc: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
a1957c3706 salt.returners.mysql: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
ef6aa5de1c salt.returners.multi_returner: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
5b4eb58d99 salt.returners.mongo_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
da1acbb8f2 salt.returners.mongo_future_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
c13bb6549c salt.returners.memcache_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
4322ad9ef3 salt.returners.influxdb_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
1dd106183c salt.returners.etcd_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
8e80535516 salt.returners.couchdb_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
44538dfced salt.returners.cassandra_cql_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
084a78407a salt.returners.couchbase_return: move minion list updates to new save_minions() func 2016-03-03 21:40:36 -06:00
Erik Johnson
f731dc5d32 Update a job's minion list to include minion lists forwarded by syndic 
This allows the job cache to include minions matched by lower-level
masters for a given job.
 2016-03-03 21:40:36 -06:00
Erik Johnson
504f7df460 Add utils function to invoke a returner's save_minions() func 2016-03-03 21:40:36 -06:00
Erik Johnson
0b4616a3eb Separate writing of serialized minion list into its own function 
This allows minions to be updated when the master receives events
containing lists of minions targeted by lower-level masters.
 2016-03-03 21:40:36 -06:00
Erik Johnson
214fedc3f6 Simplify jobs.get_jobs logic, generally improve jobs runner docs 2016-03-03 21:40:36 -06:00
Erik Johnson
3f527be748 Add an exception class for errors encountered while locking files. 2016-03-03 21:40:36 -06:00
Erik Johnson
1e6b43eef8 Add a contextmanager for file locking 2016-03-03 21:40:36 -06:00
Erik Johnson
978b6cb32f Add missing RST file for slsutil module 2016-03-03 21:40:36 -06:00
Erik Johnson
2ad8ceffc2 Add salt.utils.split_input() 2016-03-03 21:40:35 -06:00