Commit Graph

58625 Commits

Author SHA1 Message Date
Damian Myerscough
8076c9abb9 When using custom salt states we should allow the user to specify this on the command line. 2015-09-02 20:01:18 -07:00
Mike Place
27da42731d Merge pull request #26866 from garethgreenaway/manage_jenkins_via_salt
Jenkins Module and State Module
2015-09-02 19:35:54 -06:00
Nicole Thomas
7b7cfb9459 Merge pull request #26849 from marccardinal/patch-1
Missing provider to driver change
2015-09-02 17:38:08 -06:00
Gareth J. Greenaway
c48d590f60 Initially adding module and state module to manage Jenkins from Salt. 2015-09-02 16:13:04 -07:00
Marc Vieira-Cardinal
9786b98b32 Missing provider to driver change
Without this change I get:

```
2015-09-02 14:53:32,932 [salt.cloud       ][ERROR   ][354] Failed to create VM mylxc-machine. Configuration value 'provider' needs to be set
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/cloud/__init__.py", line 1257, in create
    output = self.clouds[func](vm_)
  File "/usr/lib/python2.7/dist-packages/salt/cloud/clouds/lxc.py", line 434, in create 
    'provider': vm_['provider'], },
KeyError: 'provider'
2015-09-02 14:53:32,934 [salt.state       ][ERROR   ][354] An exception occurred in this state: Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/state.py", line 1591, in call
    **cdata['kwargs'])
  File "/usr/lib/python2.7/dist-packages/salt/states/cloud.py", line 273, in profile
    info = __salt__['cloud.profile'](profile, name, vm_overrides=kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/modules/cloud.py", line 196, in profile_
    info = client.profile(profile, names, vm_overrides=vm_overrides, **kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/cloud/__init__.py", line 341, in profile
    mapper.run_profile(profile, names, vm_overrides=vm_overrides)
  File "/usr/lib/python2.7/dist-packages/salt/cloud/__init__.py", line 1417, in run_profile
    raise SaltCloudSystemExit('Failed to deploy VM')
SaltCloudSystemExit: Failed to deploy VM ret={'mylxc-machine': {'Error': 'Failed to deploy VM'}}
```

When provisioning an lxc container from a cloud.profile state.
2015-09-02 13:26:47 -04:00
Mike Place
b676e32579 Merge pull request #26758 from DSRCompany/feature/23157_module_executor
Module executors initial implementation
2015-09-02 09:22:54 -06:00
Mike Place
3778595543 Merge pull request #26828 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
2015-09-02 09:00:43 -06:00
Mike Place
9c656c7043 Merge pull request #26834 from jodv/fix_broken_module_blacklist
Module blacklist broken in 2015.8 and develop
2015-09-02 08:59:35 -06:00
Mike Place
36da4943b2 Merge pull request #26778 from nkukard/virtfix
Default to using more reliable virt detection
2015-09-02 08:58:34 -06:00
Joseph Hall
26750a4fcb Merge pull request #26840 from deuscapturus/patch-4
Update http.py
2015-09-01 23:17:36 -06:00
Theodore Cowan
3858790f66 Update http.py
fix for https://github.com/saltstack/salt/issues/21917
2015-09-01 22:34:59 -06:00
Jeremy Rosenbaum
1f9747951f actually check the blacklisted modules 2015-09-01 15:46:26 -07:00
Colton Myers
278e8dda5b Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/gce.py
2015-09-01 15:15:13 -06:00
Michael Steed
5e5c5bdb5f Merge pull request #26826 from techhat/spmunreg
Pass a package name to unregister_file()
2015-09-01 15:04:30 -06:00
Erik Johnson
b23d0d8472 Merge pull request #26572 from ngrennan-inflection/dnf-support
Adding support for dnf to yumpkg.py
2015-09-01 16:01:35 -05:00
Joseph Hall
c99ed844b8 Pass a package name to unregister_file() 2015-09-01 14:21:57 -06:00
Colton Myers
d816e9db8c Merge pull request #26757 from cachedout/leak2
Fix various filehandle leaks
2015-09-01 12:00:07 -06:00
Erik Johnson
9b628adbdf Merge pull request #26816 from gtmanfred/2015.8
rev defaults to HEAD
2015-09-01 12:51:30 -05:00
Daniel Wallace
893ae8ba15 rev defaults to HEAD 2015-09-01 12:43:59 -05:00
Mike Place
3c4523237f Merge pull request #26810 from Unity-Technologies/feature/global-environ-win
Added the ability to set permanent environment variables on windows
2015-09-01 11:42:06 -06:00
Mike Place
e7c2c1934a Merge pull request #26724 from lyft/ec2-eni-support
Add ENI support to boto_ec2 state and execution modules
2015-09-01 11:32:12 -06:00
Mike Place
e9ef513878 Merge pull request #26738 from clinta/sqlite3-update
Sqlite3 state shouldn't change anything if the rows already match, even when update=True
2015-09-01 11:22:28 -06:00
Mike Place
48ee8bd8bd Merge pull request #26780 from netudima/develop
Propagate state id value to state events
2015-09-01 11:21:16 -06:00
Mike Place
e88925f351 Merge pull request #26749 from lyft/boto-iam-user-export
Add execution module to export current IAM users
2015-09-01 11:19:53 -06:00
Mike Place
f69bdd98b3 Merge pull request #26812 from silenius/pw_user
add loginclass support for FreeBSD
2015-09-01 11:08:07 -06:00
Mike Place
aeb7831d90 Switch from weakref to static methods
This still prevents leaks and avoids a situation where the proxy is getting dereferenced too early.
2015-09-01 10:53:03 -06:00
Colton Myers
bc21dbd5bd Merge pull request #26770 from sjorge/vmadm-develop
cherry-picking of smartos virt and vmadm module
2015-09-01 10:20:13 -06:00
Julien Cigar
33e02b4697 add .. versionadded:: Boron 2015-09-01 18:08:31 +02:00
Julien Cigar
503f47590e fix lint error (E203) 2015-09-01 18:06:17 +02:00
Justin Findlay
47bc60a65e Merge pull request #26801 from jacobhammons/dockerng-options
Added doc for dockerng minion configuration options
2015-09-01 09:51:44 -06:00
Erik Johnson
5af1b236be Merge pull request #26808 from alprs/fix-git-init_args
Fix git init argument formatting
2015-09-01 09:45:10 -05:00
Dmitry Kuzmenko
85c7f1560d Fixed lint failures 2015-09-01 15:59:37 +03:00
Dmitry Kuzmenko
384ea0fb1f Returned back 'sudo' logic 2015-09-01 15:57:38 +03:00
Dmitry Kuzmenko
a267621c75 Module executors initial implementation 2015-09-01 15:57:38 +03:00
Julien Cigar
1f63197b9c add loginclass support for FreeBSD 2015-09-01 14:51:49 +02:00
Daniel Hobley
1c8e6e067f Fixed lint issues 2015-09-01 13:56:43 +02:00
Andreas Lutro
62fd025051 lint - use indexed curly braces with format 2015-09-01 13:47:17 +02:00
Andreas Lutro
1a54b7fffd git: fix git init argument formatting
git init arguments that have values should use "--arg=value" format
instead of "--arg value".
2015-09-01 11:31:52 +02:00
Pedro Algarvio
e7ed32a7d1 Merge pull request #26807 from terminalmage/rename-itersplit
Move salt.utils.itersplit() to salt.utils.itertools.split()
2015-09-01 09:02:25 +01:00
Erik Johnson
6b8769b43a Update refs to point to renamed salt.utils.itertools.split() 2015-08-31 23:18:47 -05:00
Erik Johnson
c322aa1b41 Move salt.utils.itersplit() to salt.utils.itertools.split()
In the interest of not making salt.utils any more cluttered.
2015-08-31 23:18:47 -05:00
Jacob Hammons
439570f917 More updates to docker.exec_driver 2015-08-31 16:41:35 -06:00
Jacob Hammons
673fe1af7d Updates to docker.exec_driver 2015-08-31 16:33:58 -06:00
Jacob Hammons
23d6960f12 Added doc for dockerng minion configuration options 2015-08-31 16:08:09 -06:00
Justin Findlay
e3aec144aa Merge pull request #26796 from jacobhammons/state-docs
Add doc for __states__
2015-08-31 15:37:29 -06:00
Jacob Hammons
06ac3bed42 Fixed typo 2015-08-31 13:53:59 -06:00
Jacob Hammons
45c1ff3543 Add doc for __states__ to writing states topic and 2015.8 release notes. Also added a missing line in release notes for git module updates.
Refs #21214
2015-08-31 13:51:31 -06:00
Nigel Kukard
50c6c349a9 Default to using more reliable virt detection
Default to using more reliable virtualization detection.

Better handling of lspci capabilities.
2015-08-31 17:41:06 +00:00
Mike Place
f0c9dff9bf Merge pull request #26690 from whiteinge/base64_decode
Add execution module and state module to base64 encode/decode files
2015-08-31 08:51:13 -06:00
Mike Place
ae9d39c637 Merge pull request #26764 from sjorge/is_proxy-sunos
salt.utils.is_proxy() is no longer always true on SunOS/Illumos/SmartOS
2015-08-31 08:42:27 -06:00