Commit Graph

63243 Commits

Author SHA1 Message Date
Mike Place
1123ddc89a Merge pull request #29640 from techhat/thin
Add generate_min function
2015-12-14 11:14:12 -07:00
Mike Place
e7bddef092 Merge pull request #29671 from abednarik/virtual_ret_cassandra_cql_module
modules.cassandra_cql: __virtual__ return err msg.
2015-12-14 11:12:07 -07:00
Mike Place
ef2c9e3f61 Merge pull request #29645 from rallytime/bp-29558
Back-port #29558 to 2015.8
2015-12-14 11:11:38 -07:00
abednarik
c17ac6d512 modules.deb_apache: __virtual__ return err msg.
Updated message in deb_apache module when return False if apache is not installed.
2015-12-14 15:10:23 -03:00
Mike Place
eb09f38e21 Merge pull request #29651 from zigarn/deb_apache-fixes
Deb apache fixes
2015-12-14 11:07:59 -07:00
abednarik
3b7778e45a modules.ddns: __virtual__ return err msg.
Updated message in ddns module when return False if dnspython is not installed.
2015-12-14 14:49:45 -03:00
Justin Findlay
0d260cadc5 Merge pull request #29672 from abednarik/virtual_ret_cassandra_module
modules.cassandra: __virtual__ return err msg.
2015-12-14 10:17:00 -07:00
Justin Findlay
3607e9ca3a Merge pull request #29668 from abednarik/virtual_ret_bluez_module
modules.bluez: __virtual__ return err msg.
2015-12-14 10:16:26 -07:00
Justin Findlay
8d26f9b216 Merge pull request #29663 from abednarik/virtual_ret_cloud_module
modules.cloud: __virtual__ return err msg.
2015-12-14 10:15:47 -07:00
abednarik
221c11f7da Updated documentation for Salt Development.
In order to install pip modules for salt development we need to make sure that python devel is installed.
Otherwise pip command will fail.
2015-12-14 13:57:51 -03:00
Mike Place
e7ca6e59cf Merge pull request #29659 from garethgreenaway/docker_events_engine
Initially adding engine to monitor Docker events.
2015-12-14 09:21:01 -07:00
Jiri Kotlin
3ce56cb451 pylint Python 3 code fix. 2015-12-14 15:18:54 +00:00
abednarik
c1475a9a87 modules.cassandra: __virtual__ return err msg.
Updated message in cassandra module when return False is nodetool is not found.
2015-12-14 12:09:48 -03:00
abednarik
f5dfdc42aa modules.cassandra_cql: __virtual__ return err msg.
Updated message in cassandra_cql module when return False in systems without python driver installed.
2015-12-14 12:02:19 -03:00
Jiri Kotlin
efc1399006 Added codeauthor and versionadded comments. 2015-12-14 14:52:02 +00:00
abednarik
ba2a8c4dd6 modules.bluez: __virtual__ return err msg.
Updated message in bluez module when return False in systems without bluetooth installed.
2015-12-14 11:38:26 -03:00
Jiri Kotlin
e02df6fd3c checkrestart functionality for Debian and Red Hat Based systems 2015-12-14 14:14:36 +00:00
abednarik
dfc080d8fb modules.cloud: __virtual__ return err msg.
Updated message in cloud module when return False in non posix-like systems.
2015-12-14 09:38:00 -03:00
Umberto Nicoletti
421ef21577 obey pylint 2015-12-14 08:16:22 +00:00
Gareth J. Greenaway
1effd2a3c9 Adding an engine to monitor docker for events and fire them off the Salt event bus. 2015-12-13 20:43:00 -08:00
Lvjiawei
7cb9860b4b Summary: Add two neutron api about listing and showing firewall.
Description:
Add function list_firewalls and show_firewall in salt/modules/neutron.py
Add object function list_firewalls, show_firewall and _fetch_firewall in
salt/utils/openstack/neutron.py
2015-12-14 11:17:08 +08:00
Derek Schaller
e113ec7592 Adding ability to disable npm install silent flag 2015-12-13 14:06:17 -08:00
Umberto Nicoletti
af9d7bb6b1 salt-cloud: fix two errors that slipped through in the linode driver 2015-12-13 17:10:10 +00:00
Umberto Nicoletti
c3ca61097b salt-cloud: improve linode provider to optionally create an additional datadisk 2015-12-13 15:28:03 +00:00
Alexandre Garnier
f3a2b27671 Fix deb_apache states methods tense 2015-12-13 13:58:27 +01:00
Alexandre Garnier
f4e4fd3264 Correctly check if Apache Debian-style conf is enabled 2015-12-13 13:39:39 +01:00
Alexandre Garnier
450c821432 Be more flexible when checking if Apache Debian-style mod is enabled 2015-12-13 13:39:39 +01:00
Alexandre Garnier
05a15bf564 Correctly check if Apache Debian-style site is enabled 2015-12-13 13:39:39 +01:00
Derek Schaller
39635d7773 Adding ability to disable npm install silent flag 2015-12-12 22:58:26 -08:00
Derek Schaller
e816eb2dac Adding ability to disable npm install silent flag 2015-12-12 22:19:09 -08:00
Derek Schaller
428b53e647 Adding ability to disable npm install silent flag 2015-12-12 21:23:36 -08:00
Sergey Paramonov
72003f7b71 Update user.py
### ISSUE: 
`salt/states/user.py` passes 3 args to virtual module user, but 
`salt/modules/mac_user.py` accepts only 2 arguments 

actual exception: 
```
 Name: lemon - Function: group.present - Result: Clean
----------
          ID: lemon
    Function: user.present
      Result: False
     Comment: An exception occurred in this state: Traceback (most recent call last):
                File "/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/salt/state.py", line 1594, in call
                  **cdata['kwargs'])
                File "/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/salt/loader.py", line 1491, in wrapper
                  return f(*args, **kwargs)
                File "/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/salt/states/user.py", line 471, in present
                  __salt__['user.chhome'](name, val, True)
              TypeError: chhome() takes exactly 2 arguments (3 given)
     Started: 23:03:30.934322
    Duration: 643.339 ms
     Changes:   
```

###PROPOSAL: 

to check for Darwin kernel inside `states.user.py` ,  ignoring persist arg,
2015-12-12 00:43:44 -05:00
Ruxandra Burtica
2cf9374342 Replaced tabs with spaces. 2015-12-11 16:45:38 -07:00
Ruxandra Burtica
5e7e3fe682 Returning security group when no VPC id is given, even if the group is not in EC2-classic. 2015-12-11 16:45:38 -07:00
rallytime
577d5487a3 Fixed a couple more ESXi proxy minion bugs
- Don't log the salt.utils.vmware.esxcli command (shouldn't log password)
- Make sure we catch all ssh key changes possibilities in esxi state
- Provide a use-case example of why using a list of passwords for the host is a useful idea
2015-12-11 16:16:25 -07:00
Joseph Hall
a3640d36d8 Add generate_min function 2015-12-11 14:17:07 -07:00
Mike Place
8b336dc1b4 Merge pull request #29638 from cachedout/fix_29535
Fix 29535
2015-12-11 13:37:42 -07:00
Mike Place
5bda5ff664 Updated pip module internal check for log. 2015-12-11 13:36:51 -07:00
Mike Place
a2a7f1527b Merge pull request #29632 from jfindlay/tls_virt
reduce severity of tls module __virtual__ logging
2015-12-11 13:11:32 -07:00
Mike Place
7a8d1d8cfe Merge pull request #29558 from ruxandraburtica/security-group-no-vpc-id
Returning security group when no VPC id is given
2015-12-11 12:54:34 -07:00
Mike Place
14a19f9313 Merge pull request #29634 from cachedout/lint_29459
Lint 29459
2015-12-11 12:53:07 -07:00
Mike Place
3a0a065c52 Lint #29459 2015-12-11 12:52:32 -07:00
Justin Findlay
3ed6a052fd modules.tls.__virtual__: don't spam everyone's error log 2015-12-11 12:24:13 -07:00
Justin Findlay
76a200e780 modules.tls.__virtual__: refactor cert path comment 2015-12-11 12:20:08 -07:00
Justin Findlay
0a0532e598 modules.tls.__virtual__: remove redundant parens 2015-12-11 12:19:20 -07:00
Mike Place
a13874af68 Merge pull request #29497 from whatevsz/firewalld
Expand firewalld state.
2015-12-11 10:36:14 -07:00
abednarik
7c4fa3a12e Updated pip module internal check for log.
When using pip you can append --log to store pip logs. In this case i made a change to make sure
argument to --log is not a directory, other way pip will throw and error. Also we need to make sure that
we have write permissions to that file.
2015-12-11 14:32:11 -03:00
Mike Place
50e5c72643 Merge pull request #29629 from cachedout/lint_29593
Lint 29593
2015-12-11 10:31:23 -07:00
Mike Place
ce447977d6 Lint #29593 2015-12-11 10:30:40 -07:00
Mike Place
f6f3aa6613 Merge pull request #29606 from abednarik/remove_duplicate_mtu_entry_rh7_net_template
Fixed duplicate mtu entry in RedHat 7  network configuration.
2015-12-11 10:24:45 -07:00