Commit Graph

59813 Commits

Author SHA1 Message Date
Jonathan Ballet
516c8661f4 boto_iam: fix deletion of IAM users when using delete_keys=true 2015-12-22 18:54:04 +01:00
Alexandre Létourneau
864801e002 fixed version 2015-12-22 12:47:01 -05:00
Alexandre Létourneau
041d9346c4 Enhanced netscaler docstring 2015-12-22 12:38:59 -05:00
Mike Place
be95d4d79a Merge pull request #29937 from multani/fix/states.boto_iam-group-users
Fix states.boto_iam group users
2015-12-22 10:33:02 -07:00
Mike Place
4f2cc5eba7 Merge pull request #29934 from multani/fix/boto_iam
Fix state.boto_iam virtual name
2015-12-22 10:16:24 -07:00
Mike Place
b36302291d Merge pull request #29943 from cachedout/issue_29933
Check args correctly in boto_rds
2015-12-22 10:15:48 -07:00
twangboy
7f0b87bfb3 Added pre/post flight scripts (not running) 2015-12-22 09:28:47 -07:00
Mike Place
8bab5eaeaa Check args correctly in boto_rds
Fixes #29933
2015-12-22 09:03:57 -07:00
Mike Place
229d3eb60b Merge pull request #29941 from cachedout/boto_spelling
Fix spelling error in boto_vpc
2015-12-22 08:49:54 -07:00
Mike Place
b11bfd07b8 Fix spelling error in boto_vpc 2015-12-22 08:48:48 -07:00
Jonathan Ballet
5c86a78d75 boto_iam: handle group's users empty list by removing all users of the group 2015-12-22 16:26:57 +01:00
Jonathan Ballet
f3461053df boto_iam: passes connection information down to callees 2015-12-22 16:24:02 +01:00
Jonathan Ballet
503ede4178 Fix state.boto_iam virtual name 2015-12-22 16:05:18 +01:00
Mike Place
69c5ada636 Merge pull request #29908 from cachedout/issue_29880
Allow kwargs to be passed to pacman provide for update func
2015-12-22 08:04:18 -07:00
Mike Place
ad0de4d563 Merge pull request #29909 from abednarik/freebsd_pkgng_non_interactive_fix
FreeBSD pkgng fix for non-interactive install.
2015-12-22 08:03:50 -07:00
Mike Place
02ed5b8fd1 Merge pull request #29924 from gqgunhed/gqgunhed-2015.8
fixed: uptime now working on non-US Windows
2015-12-22 08:03:17 -07:00
gqgunhed
b67c3b45e1 removed duplicate datetime line
copy/paste error
2015-12-22 12:25:49 +01:00
gqgunhed
ed8ee91dcf fixed: uptime now working on non-US Windows
1. works independent from Windows OS language setting
uptime now uses "wmic os get lastbootuptime" which returns just the time.
The former matching relied on matching English text and time format.

2. datetime.now() changed to datetime.datetime.now()
2015-12-22 12:21:05 +01:00
abednarik
8ac213001a FreeBSD pkgng fix for non-interactive install.
In pkgng the way to install packages and assumming yes in pre and post install scripts is to use
-y, same as apt-get or yum, for example. Also env variable ASSUME_ALWAYS_YES=YES can be used, but
in this case, is a good idea to follow others package manager implementation.
Also remove the check where only -y is used if pkgng is executed in dryrun mode. In this case
there is no difference between dryrun or not.
2015-12-21 19:02:03 -03:00
Mike Place
4cd77b4118 Allow kwargs to be passed to pacman provide for update func
Other providers do this. Pacman was probably just forgotten.

Fixes #29880
2015-12-21 14:31:49 -07:00
twangboy
9eeb6da7bd Improvements to osx packaging scripts 2015-12-21 13:07:53 -07:00
Mike Place
5e44639334 Merge pull request #29883 from serge-p/patch-6
fix for nfs mounts in _active_mounts_openbsd()
2015-12-21 11:26:49 -07:00
Mike Place
08fd81cc3d Merge pull request #29894 from techhat/spmsaltfile
Support Saltfile in SPM
2015-12-21 11:03:07 -07:00
Mike Place
4f46255044 Merge pull request #29856 from rallytime/esxi-unit-tests
Added some initial unit tests for the salt.modules.vsphere.py file
2015-12-21 10:12:20 -07:00
Mike Place
096fec6182 Merge pull request #29855 from rallytime/bp-29740
Back-port #29740 to 2015.8
2015-12-21 10:11:28 -07:00
Sergey Paramonov
dd94332f24 Update mount.py
added a line
2015-12-21 12:01:41 -05:00
Joseph Hall
279ec61274 Support Saltfile in SPM 2015-12-21 09:37:25 -07:00
Mike Place
02ab9b8858 Merge pull request #29890 from multani/fix/docs
Various documentation fixes
2015-12-21 09:25:15 -07:00
Jonathan Ballet
5aa0e9b1e0 Fix documentation typo for pillars 2015-12-21 13:26:02 +01:00
Jonathan Ballet
f2b41d04d7 Fix rendering issues for Cherrypy netapi documentation. 2015-12-21 13:26:02 +01:00
Jonathan Ballet
6922da46dc doc: fix warnings + some rendering issues 2015-12-21 13:26:02 +01:00
Sergey Paramonov
9d059a1ea5 fix for nfs mounts in _active_mounts_openbsd()
attempting to run following state
---

/backup:
  mount.mounted:
    - device: joule:/backup
    - fstype: nfs
    - mkmnt: True
    - opts: rw,nodev,nosuid

getting unexpected behavior: 
----------
 
``` 
        ID: /backup
    Function: mount.mounted
      Result: False
     Comment: An exception occurred in this state: Traceback (most recent call last):
                File "/usr/local/lib/python2.7/site-packages/salt/state.py", line 1591, in call
                  **cdata['kwargs'])
                File "/usr/local/lib/python2.7/site-packages/salt/states/mount.py", line 120, in mounted
                  active = __salt__['mount.active'](extended=True)
                File "/usr/local/lib/python2.7/site-packages/salt/modules/mount.py", line 184, in active
                  _active_mounts_openbsd(ret)
                File "/usr/local/lib/python2.7/site-packages/salt/modules/mount.py", line 148, in _active_mounts_openbsd
                  'opts': parens[1].split(", "),
              IndexError: list index out of range
     Started: 21:51:47.764708
    Duration: 38.882 ms
```

issue clarification: 
---
function _active_mounts_openbsd() 
expecting all mount points to have DUID   
but NFS mounts do not have DUIDs generated, so line need to be parsed separately  

proposal: 
---
1. check length of parens array 
2. and have a different parsing for lines with no DUIDs  in them

testing same state after change: 
---

```
  Name: /etc/fstab - Function: file.blockreplace - Result: Clean
  Name: /d01 - Function: mount.mounted - Result: Clean
  Name: /stage - Function: mount.mounted - Result: Clean
  Name: /backup - Function: mount.mounted - Result: Changed
```

---
Thanks, 
Sergey.
2015-12-20 22:56:38 -05:00
rallytime
b908ebd123 Added some initial unit tests for the salt.modules.vsphere.py file
More will follow to cover the remaining functions.
2015-12-18 16:18:01 -07:00
Mathieu Le Marec - Pasquet
4c5e277367 Type mess in git.latest
Did not get why, but we can have a list of comments instead of stings.

This fixes:
```
     line 107, in _uptodate\n    ret['comment'] += '\\n\\nChanges made: ' + comments\nTypeError:
      cannot concatenate 'str' and 'list' objects\n"
    duration: 366.804
    name: https://github.com/makinacorpus/makina-states.git
    result: false
```
2015-12-18 15:13:15 -07:00
Colton Myers
50f48c4bf3 Merge pull request #29850 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-12-18 14:33:49 -07:00
Colton Myers
7402599c62 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-12-18 13:55:15 -07:00
Mike Place
05d2aaaef2 Merge pull request #29811 from alprs/feature-influxdb_retention
influxdb: add retention policy module functions
2015-12-18 10:19:02 -07:00
Mike Place
7eefaac58a Merge pull request #29814 from basepi/multi-master.windows.29396
[2015.8][Windows] Fix multi-master on windows
2015-12-18 10:16:52 -07:00
Mike Place
fb4eb28645 Merge pull request #29819 from rallytime/esxi-docs
Add esxi module and state to docs build
2015-12-18 09:20:27 -07:00
Mike Place
e865c787a4 Merge pull request #29832 from jleimbach/fix-keyboard.py-for-rhel-without-systemd
Fixed typo in order to use the keyboard module for RHEL without systemd
2015-12-18 09:04:57 -07:00
jle
7b72b3c52c Fixed typo in order to use the keyboard module for RHEL without systemd 2015-12-18 09:12:29 +01:00
rallytime
e7c5863468 Add esxi module and state to docs build
Also fixed some minor doc errors
2015-12-17 16:33:59 -07:00
Colton Myers
2405501d75 Add documentation for tcp ipc_mode and multi-master 2015-12-17 14:08:41 -07:00
Colton Myers
307e867980 For tcp ipc_mode, give each minion different pub/pull ports 2015-12-17 13:59:25 -07:00
Andreas Lutro
51088d938a add tests, rename a function to more closely mirror influxdb 2015-12-17 21:58:51 +01:00
Andreas Lutro
785da17a67 missing comma 2015-12-17 21:43:42 +01:00
Colton Myers
5a21893e82 Fix ipc_mode check in windows
Although 'tcp' is the only supported ipc_mode in windows, this
check was completely wrong and would never allow overriding it.
2015-12-17 13:25:47 -07:00
Andreas Lutro
7e9e9a1030 influxdb: add retention policy module functions 2015-12-17 20:07:00 +01:00
Mike Place
4044f3bb93 Merge pull request #29803 from rallytime/vsphere-docs
Add vSphere module to doc ref module tree
2015-12-17 11:52:56 -07:00
Mike Place
9b4c2194f6 Merge pull request #29767 from abednarik/network_mod_hpstname_fix
Hosts file update in mod_hostname.
2015-12-17 11:31:18 -07:00