Commit Graph

61292 Commits

Author SHA1 Message Date
Nitin Madhok
3c11234a05 Make sure variable is a dictionary before popping something from it. 2016-03-08 13:15:18 -07:00
Bo Maryniuk
1882e1c960 Adjust test 2016-03-08 20:08:18 +01: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
Nicole Thomas
c0868307df Merge pull request #31743 from Talkless/patch-1
Fix parentheses missmatch in documentation
2016-03-08 11:01:23 -07:00
Joseph Hall
44c100d610 Use get_local_client with MASTER opts, not MINION 2016-03-08 10:35:35 -07: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
Bo Maryniuk
f96c8f9b5e Keep first level away from lists. 2016-03-08 16:22:45 +01:00
Bo Maryniuk
baaed005b8 Fix PEP8 continuation 2016-03-08 16:04:24 +01:00
Bo Maryniuk
1db61ea59a Fix the always-false behavior on checking state (there are always lists at some point!) 2016-03-08 16:00:26 +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
Vincas Dargis
26ff46dbc6 Fix parenthesis missmatch in documentation 2016-03-08 10:18:47 +02: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
rallytime
67d1aa6740 Remove experimental/incomplete function 2016-03-07 17:04:12 -07:00
rallytime
b209623ca9 Add reboot, start, and stop actions to digital ocean driver
Fixes #31639
2016-03-07 17:01:13 -07:00
Jacob Hammons
26d4991cb3 moved previous intro to new quick start topic (topics/cloud/qs.rst)
added new intro that explains the salt cloud configuration files
added an inheritance and minion startup state example to topics/cloud/config.rst
2016-03-07 16:06:16 -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
Jorge Schrauwen
df1ba94cbb file_ignore_regex is a list, not bool 2016-03-07 17:28:40 +00: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
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
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
9162925dd0 Merge pull request #31689 from rallytime/bp-29467 2016-03-06 12:26:11 -07:00
C. R. Oldham
aa5c13f0b8 Merge pull request #31702 from rallytime/merge-2015.8 2016-03-06 12:24:46 -07: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
Pedro Algarvio
1ca2beea3e
It's a function! 2016-03-06 01:45:14 +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
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
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
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
27f443895d Merge pull request #31682 from cachedout/cache_meaning
Add definition of job cache to glossary
2016-03-04 13:07:19 -07:00