Commit Graph

50627 Commits

Author SHA1 Message Date
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
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
Mike Place
bd04c964d1 Merge pull request #31658 from rallytime/add-style-to-contrib
Add mentioned of Salt's Coding Style docs to the Contributing docs
2016-03-03 15:14:57 -07:00
Erik Johnson
da954d7b92 Add integration test for packages with epoch in version
This starts with cent7, but later I can add cent6 as well.
2016-03-03 15:40:22 -06:00
Erik Johnson
4fa7e4defe Move epoch removal
The previous commit causes a failure when a package does not have a
version specified. Caught by integration tests, yay!
2016-03-03 15:39:12 -06:00
Erik Johnson
290192af56 Remove epoch from version string if present when installing with yum
yum install does not support epoch without the arch, and we won't know
what the arch will be when it's not provided. It could either be the OS
architecture, or 'noarch', and we don't make that distinction in the
pkg.list_pkgs return data.

Fixes #31619.
2016-03-03 13:20:25 -06:00
rallytime
6b526b5878 Add mentioned of Salt's Coding Style docs to the Contributing docs 2016-03-03 11:41:46 -07:00
Mike Place
10658dffe6 Merge pull request #31655 from rallytime/pylint-docs
Make note of pylint dependencies in docs
2016-03-03 11:37:06 -07:00
rallytime
6e0377d376 Make note of pylint dependencies in docs 2016-03-03 10:56:22 -07:00
Nicole Thomas
6075774a01 Merge pull request #31440 from cachedout/master_tops_type
Set correct type for master_tops config value
2016-03-02 14:17:14 -07:00
Nicole Thomas
6d31b8918f Merge pull request #31622 from jfindlay/query_doc
doc/topics/tutorials/http: update query decoding docs
2016-03-02 11:23:44 -07:00
Justin Findlay
4e48fec806 doc/topics/tutorials/http: update query decoding docs
Fixes #31614.
2016-03-02 10:17:22 -07:00
Mike Place
dbf6e0786c Merge pull request #31558 from cachedout/ensure_ssh_installed
Don't stacktrace if ssh binary is not installed with salt-ssh
2016-02-29 15:15:44 -07:00
Mike Place
cecc6e0a5f Don't stacktrace if ssh binary is not installed with salt-ssh 2016-02-29 11:26:35 -07:00
Mike Place
060a60fd90 Merge pull request #31521 from terminalmage/issue24753
salt-ssh: Fix race condition when caching files to build the thin tarball
2016-02-29 08:32:22 -07:00
Erik Johnson
0d352bbc16 Add fileclient tests 2016-02-29 01:05:33 -06:00
Erik Johnson
d9370a8041 Update cp module salt-ssh wrapper to use new cachedir param 2016-02-26 16:07:47 -06:00
Erik Johnson
0320494b1d Update the SSH state module wrappers to pass an alternate cachedir 2016-02-26 16:07:47 -06:00
Erik Johnson
65bdcb3afa Accept and pass through the alternate cachedir when prepping the thin tar 2016-02-26 16:07:47 -06:00
Erik Johnson
c3f7a2f2e5 Add ability to specify an alternate base dir for file caching
This commit extends the fileclient such that it is possible to override
the base directory for file caching. The new "cachedir" param can be
either a relative path or an absolute path. If it is relative, the path
will be appended to __opts__['cachedir'], and if it is absolute then it
will take the place of __opts__['cachedir'].
2016-02-26 16:07:47 -06:00
Mike Place
92f8f89218 Merge pull request #31497 from rallytime/remove-timeout-dup
Remove duplicate "timeout" definition in Roster docs
2016-02-26 08:01:30 -07:00
rallytime
83e6480d20 Remove duplicate "timeout" definition in Roster docs 2016-02-25 14:05:38 -07:00
Mike Place
da001bcb49 Merge pull request #31472 from rallytime/update-contributing-docs
Update contributing docs
2016-02-25 09:05:59 -07:00
rallytime
5871e4d1e0 Update contributing docs 2016-02-24 15:38:37 -07:00
Mike Place
f35e2dd1d3 Merge pull request #31461 from DSRCompany/issues/30183_fix_multimaster_failover_2015.5
Set auth retry count to 0 if multimaster mode is failover.
2016-02-24 10:15:30 -07:00
Dmitry Kuzmenko
3d09c3b7a3 Set auth retry count to 0 if multimaster mode is failover.
Backport of PR #31382 into 2015.5.
2016-02-24 19:00:32 +03:00
Nicole Thomas
26733ce988 Merge pull request #31442 from sastorsl/salt-modules-file.py-copy-check-src
Add os.path.exists(src) to file.py, def copy
2016-02-23 16:40:03 -07:00
Nicole Thomas
e480727d27 Merge pull request #31441 from cachedout/issue_30739
Include localhost minions in presence detection for runner
2016-02-23 16:36:59 -07:00
Stein Arne Storslett
0a4132866d removed lint in the exception string 2016-02-23 22:20:55 +01:00
Stein Arne Storslett
f8b5d498c3 Add os.path.exists(src) to file.py, def copy
Fixes #31356
2016-02-23 21:03:25 +01:00