valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
50,608 Commits 24 Branches 182 Tags 341 MiB
1b97e4a3df
Commit Graph

50608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply 
Resolves #32037.
 2016-03-21 22:56:17 -05:00
Mike Place
2d1f2a0c2e Merge pull request #31935 from twangboy/fix_build_script2 
Back port nullsoft build script from 2015.8
 2016-03-17 08:54:50 -06:00
twangboy
4af8c9dbfc Back port nullsoft build script from 2015.8 2016-03-16 17:57:04 -06:00
Mike Place
43240dc566 Merge pull request #31912 from jfindlay/log_mixin 
log.mixins: remove extermporaneous .record
 2016-03-15 19:56:46 -06:00
Justin Findlay
9f9c694654 log.mixins: remove extermporaneous .record 2016-03-15 16:54:09 -06:00
Mike Place
440e0dcbe0 Merge pull request #31825 from jtand/udpate_pylintrc 
Updated .testing.pylintrc to match newer versions of pylint
 2016-03-15 12:12:44 -06:00
Nicole Thomas
471c9444a3 Merge pull request #31900 from rallytime/fix-psutil-warning 
Add "python module" clarification to ps __virtual__ warning.
 2016-03-15 11:59:35 -06:00
rallytime
22403d69ae Add "python module" clarification to ps __virtual__ warning. 
Added based on comment from Issue #31867
 2016-03-15 10:53:12 -06:00
justinta89
9a14e02766 Updated beacons/sh.py to work with enumerate() 2016-03-14 16:13:40 -06:00
Mike Place
c44c1b5e59 Merge pull request #31878 from rallytime/fix-psutil-warning 
Make sure __virtual__ error message is helpful when psutil is missing
 2016-03-14 15:31:42 -06:00
justinta89
0ecec691a0 Adjusted beacons to work with enumerate better 2016-03-14 14:33:32 -06:00
rallytime
44b29f72a1 Make sure __virtual__ error message is helpful when psutil is missing 
Fixes #19659
Fixes #31867
 2016-03-14 12:33:53 -06:00
justinta89
f509b4113e Fixed final lint error 2016-03-14 11:28:40 -06:00
justinta89
5945b3f11f Fix and disable pylint errors 2016-03-14 10:38:07 -06:00
justinta89
06ae6eaf55 Fixed pylint errors on jboss state and module 2016-03-14 10:34:51 -06:00
justinta89
de96db97c8 Fixed more pylint errors, and disabled some more 2016-03-14 09:42:08 -06:00
Nicole Thomas
5c592b6768 Merge pull request #31852 from rallytime/merge-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2016-03-12 19:47:02 -07:00
rallytime
1470de17fa Merge branch '2014.7' into '2015.5' 2016-03-12 19:08:20 -07:00
Nicole Thomas
218c902091 Merge pull request #31834 from jfindlay/2014.7 
add 2014.7.8 release notes
 2016-03-11 14:35:42 -07:00
Justin Findlay
358fdad0c8 add 2014.7.8 release notes 2016-03-11 14:31:51 -07:00
Nicole Thomas
a423c6cd04 Merge pull request #31833 from jfindlay/2014.7 
add 2014.7.9 release notes
 2016-03-11 14:19:55 -07:00
justinta89
c07b0a20b5 Merge branch 'lint_fixes' into udpate_pylintrc 2016-03-11 14:10:43 -07:00
Justin Findlay
6910fcc584 add 2014.7.9 release notes 2016-03-11 14:08:55 -07:00
Nicole Thomas
c5e7c03953 Merge pull request #31826 from gtmanfred/2014.7 
Remove ability of authenticating user to specify pam service
 2016-03-11 13:41:01 -07:00
Nicole Thomas
0cc1d5db03 Merge pull request #31827 from gtmanfred/2015.5 
Remove ability of authenticating user to specify pam service
 2016-03-11 13:40:18 -07:00
justinta89
2e6a152308 Fixed lint error in lxc.py 2016-03-11 12:54:20 -07:00
justinta89
908ca1a439 Fixed lint error in ssh_py_shim 2016-03-11 12:52:52 -07:00
justinta89
404c1b50f7 Changed range(len()) to enumerate() 2016-03-11 11:50:05 -07:00
justinta89
1e13586546 Changed range(len()) to enumerate() 2016-03-11 11:48:33 -07:00
justinta89
9ccce7a9a5 Added more disables 2016-03-11 11:29:21 -07:00
Daniel Wallace
979173b78a Remove ability of authenticating user to specify pam service 
This should be set at the master level, so that whoever is
authenticating has to conform to what is set by the administrator that
setup salt.
 2016-03-11 11:25:48 -07:00
justinta89
9c1aab3b4e Updated .testing.pylintrc to match newer versions of pylint 2016-03-11 10:59:43 -07:00
Daniel Wallace
d73f70ebb2 Remove ability of authenticating user to specify pam service 
This should be set at the master level, so that whoever is
authenticating has to conform to what is set by the administrator that
setup salt.
 2016-03-11 10:42:04 -07:00
Nicole Thomas
8cf0b9eb3d Merge pull request #31810 from whiteinge/saltenv-jinja-var 
Fix outdated Jinja 'env' variable reference
 2016-03-10 20:52:21 -07:00
Seth House
cb72b19240 Fix outdated Jinja 'env' variable reference 2016-03-10 19:48:42 -07:00
Nicole Thomas
970ef0e445 Merge pull request #31744 from brejoc/fix-attribute-error-with-older-libcloud/2015.5 
Fix for AttributeError with libcloud <0.15
 2016-03-09 17:15:26 -07:00
Nicole Thomas
df2d23ba5d Merge pull request #31740 from terminalmage/issue31666 
Assume pillar_opts is False when not specified in masterless mode
 2016-03-09 15:57:57 -07:00
Nicole Thomas
e22f5c0a26 Merge pull request #31750 from rallytime/bp-26170 
Back-port #26170 to 2015.5
 2016-03-09 10:44:14 -07:00
Nitin Madhok
3c11234a05 Make sure variable is a dictionary before popping something from it. 2016-03-08 13:15:18 -07:00
Jochen Breuer
bb29dc2283 Added version to libcloud depends statement 
Now states ">= 0.15" instead of no version.
 2016-03-08 19:49:14 +01:00
Jochen Breuer
87f9534fce Added log message with update suggestion for libcloud 
Log message notifies user of old libcloud version and inability to get
projects.
 2016-03-08 17:10:06 +01:00
Jochen Breuer
72eab406cd Fix for AttributeError with libcloud <0.15 
ex_list_projects is introduced in version 0.15 of libcloud. I'm simply
cathing the AttributeError here to return False, just like there would
be not project.

Fixes #31729
 2016-03-08 14:37:40 +01:00
Erik Johnson
aeaf5864cd Fall back to False when pillar_opts not set 
This should have been changed when we altered the default value in
16a3938. It caused a missing pillar_opts minion config value to
incorrectly assume that master config should have been added to the
pillar data.
 2016-03-07 21:36:30 -06:00
Erik Johnson
fe19d77eb4 Add default value for pillar_opts on minion 2016-03-07 21:34:28 -06:00
C. R. Oldham
9162925dd0 Merge pull request #31689 from rallytime/bp-29467 2016-03-06 12:26:11 -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
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
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
e33c1f456a Merge pull request #31683 from rallytime/bp-31578 
Back-port #31578 to 2015.5
 2016-03-04 13:47:41 -07:00