Commit Graph

3031 Commits

Author SHA1 Message Date
Thomas S Hatch
34be8f2c4b Add wtag checks to master 2012-02-27 15:19:28 -07:00
Thomas S Hatch
2857276b18 Add passign master's id to syndic return 2012-02-27 15:15:02 -07:00
Thomas S Hatch
71c391d771 pidfile missing from cli struct 2012-02-27 14:01:40 -07:00
Thomas S Hatch
ece2c2771e Merge branch 'develop' of github.com:saltstack/salt into develop 2012-02-27 13:49:11 -07:00
Thomas S Hatch
a74c104785 Remove redundant code 2012-02-27 13:48:48 -07:00
Thomas S Hatch
dddeca0de3 Merge pull request #774 from fatbox/mysql-module
Fix mysql __virtual__ to correctly detect config
2012-02-27 07:50:15 -08:00
Thomas S Hatch
df6a8141c7 Merge branch 'basestring' of https://github.com/fatbox/salt into fatbox-basestring
Conflicts:
	salt/state.py
2012-02-27 08:48:03 -07:00
Evan Borgstrom
e6481b875f Fix mysql __virtual__ to correctly detect config
It looks like when the following commit[1] was made it broke the mysql
module, and I haven't noticed until now some how.

My guess is that __opts__ used to look like
__opts__['mysql']['default_file'] where as it now looks like
__opts__['mysql.default_file']

[1] = b7e7cc3cb1
2012-02-27 10:43:56 -05:00
Thomas S Hatch
cb6a9ac5bb Merge pull request #771 from pille/ubuntu-packaging
updated ubuntu install doc
2012-02-27 07:14:31 -08:00
pille
aa08f8a52b updated ubuntu install doc
currently there's no single up-to-date salt-package anymore.
it has been split into pieces. wrt #711.
2012-02-27 11:44:48 +01:00
Evan Borgstrom
15e0ff5483 When using isintance to detect strings we should check for basestring
I spent the past 30 min trying to debug a problem where when a command
was published to the minion it was arriving as a string instead of a
tuple. The cmd.run module was receiving:

    {
	'arg': 'mycommand myarg1 myarg2'
	'fun': 'cmd.run',
	'jid': '20120226160155389058',
	'ret': '',
	'tgt': 'mytarget'
    }

This was causing the following exception:

    TypeError: run() takes at most 3 arguments (20 given)

I traced this down to the publish module checking for an instance of
'str' and splitting on ','.

In my instance the problem was being caused because Django likes to use
Unicode strings everywhere and the isintance was returning False.

I've replaced all instances of str with basestring in all the isintance
checks.
2012-02-26 16:11:34 -05:00
Thomas S Hatch
43de62c855 fix issue where grains don't always load static config content 2012-02-26 10:22:52 -07:00
Thomas S Hatch
0ffdcfe931 Add deprecation tot he salt -Q option 2012-02-25 23:46:30 -07:00
Thomas S Hatch
a010ffa9f3 Add deprecation warning to manpage for salt -Q 2012-02-25 23:41:41 -07:00
Thomas S Hatch
d4d1e6a2fa fic docstring in rh_service module 2012-02-25 23:39:17 -07:00
Thomas S Hatch
e1bcb75a71 Add initial upstart support for Ubuntu 2012-02-25 23:37:48 -07:00
Thomas S Hatch
632336ffbb Add dynamic module loading doc 2012-02-25 23:19:09 -07:00
Thomas S Hatch
c1c7a24a9f Merge pull request #769 from UtahDave/develop
Basic Windows Registry management
2012-02-25 20:27:13 -08:00
David Boucha
a7251ba856 Basic Windows Registry management
Squashed commit of the following:

commit 6cf776ebbb7d742934a0ab2bd823fd360b8868ce
Author: David Boucha <boucha@gmail.com>
Date:   Sat Feb 25 20:30:36 2012 -0700

    Basic Windows Registry management completed

commit f18a2e99396bcc0154fc0a20be8800f166f5acb5
Author: David Boucha <boucha@gmail.com>
Date:   Sat Feb 25 17:34:54 2012 -0700

    Add reg.read_key

commit e8cecf96c31f9c2a545614a5a901c26125197887
Author: David Boucha <boucha@gmail.com>
Date:   Sat Feb 25 15:25:09 2012 -0700

    Add reg.py for managing Registry settings in Windows
2012-02-25 20:51:52 -07:00
Thomas S Hatch
3d342ecfa0 Merge pull request #767 from archtaku/develop
add recursive ownership management to file.directory
2012-02-25 17:47:02 -08:00
Erik Johnson
ef484d39aa add recursive ownership management to file.directory 2012-02-25 19:29:43 -06:00
Thomas S Hatch
e224a60388 Merge pull request #766 from uggedal/develop
More concise handling of extend members across states.
2012-02-25 16:43:21 -08:00
Eivind Uggedal
706b980e66 More concise handling of extend members across states. 2012-02-26 01:41:48 +01:00
Thomas S Hatch
e29eee2fe6 Merge pull request #765 from uggedal/develop
Fix bug where only the last extend across a highstate was realized.
2012-02-25 16:38:20 -08:00
Eivind Uggedal
17f2ac717d Fix bug where only the last extend across a highstate was realized. 2012-02-26 01:36:00 +01:00
Thomas S Hatch
69958807ad The shadow module != file 2012-02-25 17:00:48 -07:00
Thomas S Hatch
df4c8ed760 Add run_num to 0 sls file return 2012-02-25 15:15:05 -07:00
Thomas S Hatch
1211cfff34 Add openvz ps option 2012-02-25 15:00:40 -07:00
Seth House
f01a76546e Removed old grains doc from toctree
Should have been in 084f8a7.
2012-02-25 14:56:29 -07:00
Seth House
bca4c2ff12 Added document-level headings to platform-specific headings 2012-02-25 14:56:29 -07:00
Seth House
be81d5dde5 Removed duplicate global labels from install tutorials 2012-02-25 14:56:28 -07:00
Seth House
2ed2241ff7 Moved platform-specific tutorials into the installation instructions 2012-02-25 14:56:28 -07:00
Seth House
d9b17cede2 Re-added the installation docs
Since RTD build the latest docs as the default available docs having the
installation instructions along with the rest of the docs is really the
best place for them to live.

Fixes #762
Fixes #763
2012-02-25 14:55:44 -07:00
Thomas S Hatch
61edeecdf6 Add providers doc 2012-02-25 01:52:48 -07:00
Thomas S Hatch
738ec9b029 change redirect to provider
Jeff wins, redirect is not provider (I am still open to suggestions
since I would like something else, but this is making the most
sense so far)
2012-02-25 01:35:09 -07:00
Seth House
71b25d7d16 Merge branch 'doc-targeting' into develop 2012-02-25 01:24:45 -07:00
Seth House
084f8a7259 Added and organized documents on ways of targeting minions 2012-02-25 01:15:57 -07:00
Thomas S Hatch
cd75bdd485 I would rather not talk about it 2012-02-25 00:38:28 -07:00
Thomas S Hatch
ff267ce187 fix ref to dict in grain matching addition 2012-02-25 00:32:29 -07:00
Thomas S Hatch
29a9992c5f Fix glob matching to use fnmatch 2012-02-25 00:29:16 -07:00
Thomas S Hatch
62df7c2d66 Fix docstrings in the rh_service module 2012-02-25 00:21:46 -07:00
Thomas S Hatch
23089ed7a7 Fix issues in code from previous commit
I might need to get some sleep in...
2012-02-25 00:11:11 -07:00
Thomas S Hatch
b72fa96756 Add support for matching grains that are in a list
Fixes #752, Before this matching grains in a list was difficult at
best. Now matching will match any individual member of a list. This
makes adding a roles grain much easier!
2012-02-25 00:09:30 -07:00
Seth House
6564683052 Updated legacy reference to the minion id as 'hostname' 2012-02-24 23:44:31 -07:00
Seth House
8070d1f479 Made steps 1 & 2 more explicitly tutorials 2012-02-24 23:44:31 -07:00
Thomas S Hatch
c9aa48abb9 Merge pull request #755 from UtahDave/develop
Add ability for Salt States to manage groups on Windows
2012-02-24 22:38:02 -08:00
David Boucha
1dc48fc940 Add ability for Salt States to manage groups on Windows 2012-02-24 23:33:14 -07:00
Seth House
99ec9edd79 Move ternary expressions out of format() calls in pip
This would break if you didn't specify a virtualenv and a requirements
file when calling out to pip.

Fixes #754. Thanks for the report @araddon!
2012-02-24 23:28:42 -07:00
Thomas S Hatch
5068ba8c7a Merge pull request #748 from UtahDave/develop
Add ability for Salt States to manage users on Windows
2012-02-24 21:59:52 -08:00
Thomas S Hatch
27fe9a438c Merge pull request #753 from archtaku/develop
Fix bug with copying nonexistant files using cp.get_file
2012-02-24 21:59:04 -08:00