Seth House
983ef87626
Change setup.py shebang to point to python instead of python2
2012-07-15 11:18:38 -07:00
Thomas S Hatch
24df88cb87
Merge pull request #1628 from jre/grains
...
Grain fiddling on OpenBSD (second try)
2012-07-15 08:38:54 -07:00
Joshua Elsasser
c4524819e4
Insure num_cpus grains is an int on BSD systems, for consistency with Linux.
2012-07-15 07:53:55 -07:00
Joshua Elsasser
de41270818
On OpenBSD, set cpuarch grain to the application architecture, not kernel.
...
OpenBSD has the concept of a separate application architecture and
kernel architecture. The former may be shared between several
platforms while the latter is unique.
For example, a PowerPC Macintosh computer will have application and
kernel architectures of 'powerpc' and 'macppc', respectively. Certain
PowerPC-based NAS hardware will have the same application architecture
but have a kernel architecture of 'socppc'. This allows them to have
different kernels and base systems while sharing the same set of
packages.
2012-07-15 07:53:47 -07:00
Joshua Elsasser
47c237dc50
Rename and refactor the BSD cpudata grains function.
2012-07-15 07:53:24 -07:00
Thomas S Hatch
53285798e0
The watcher function is called mod_watch now
...
and has been for some time...
2012-07-15 01:03:26 -06:00
Thomas S Hatch
7b63b7edb5
Merge pull request #1626 from intchanter/develop
...
Made some language clearer.
2012-07-15 00:00:24 -07:00
Intchanter
588f93a5cd
Made some language clearer.
2012-07-15 00:57:53 -06:00
Thomas S Hatch
e87f442213
Fix #1621
2012-07-15 00:15:15 -06:00
Thomas S Hatch
e3156635d0
Fix #1515
2012-07-15 00:13:12 -06:00
Thomas S Hatch
05d07c4512
Add error detection to pillar top files
2012-07-14 23:58:22 -06:00
Thomas S Hatch
3f0e9ad8df
Merge pull request #1625 from dekkers/fix-undefined-name-errors
...
Fix "undefined name" errors spotted by pyflakes
2012-07-14 22:01:26 -07:00
Thomas S Hatch
45c6ffe0b0
Merge pull request #1624 from bretep/develop
...
Print salt version
2012-07-14 18:33:08 -07:00
Jeroen Dekkers
a28272e2fb
Fix "undefined name" errors spotted by pyflakes
2012-07-15 03:01:35 +02:00
Bret Palsson
83de9bb4b1
Reverting the spec file
...
I was wrong... when building the src rpm you only need to have the files defined in the Source{n}. So if you have the packaged files tarballed, grabbing the version automatically will not work.
2012-07-14 17:41:08 -06:00
Bret Palsson
f803935d26
Merge remote-tracking branch 'upstream/develop' into develop
2012-07-14 17:17:04 -06:00
Bret Palsson
52b3aebe01
Get version of salt when building RPM
...
When building an RPM either src or binary you must have all the source files in the %{_sourcedir}, this means we can pull out the version of salt we are building from the source files, keeping things sane. The source URL in the salt.spec file is only used for documentation purposes, we don't use it to grab the source to build from. This potentially could change, but 99.99% of the packages out there do not do this.
2012-07-14 17:03:57 -06:00
Jeff Schroeder
300856a030
Merge pull request #1623 from mrud/mru/zypper
...
Use zypper for all Suse products instead of only for openSUSE
2012-07-14 11:08:42 -07:00
Ulrich Dangel
8604b586cd
Use zypper for all Suse products instead of only for openSUSE
2012-07-14 18:52:15 +02:00
Joshua Elsasser
b24b5fc5d5
Don't set hardware grains on OpenBSD if the matching sysctl isn't available.
...
This means that OpenBSD minions won't end up with grains such as
biosversion set to 'sysctl: hw.version: value is not available', the
grain will instead be absent.
2012-07-14 08:11:20 -07:00
Thomas S Hatch
ade4a9f02d
fix overlooked conversion to sreq
2012-07-14 00:54:43 -06:00
Thomas S Hatch
b4ae7d97a0
fix email
2012-07-13 09:38:59 -06:00
Thomas S Hatch
c32868aa97
Merge pull request #1622 from brutasse/pycrpyto-case
...
Removed camelcase from the pycrypto requirement as it's not the original package's spelling
2012-07-13 07:57:05 -07:00
Bruno Renié
d637ecc34f
Removed camelcase from the pycrypto requirement as it's not the original package's spelling
2012-07-13 16:36:25 +02:00
Thomas S Hatch
513442168a
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-07-12 21:40:48 -06:00
Thomas S Hatch
14a386a4a7
update old school print statement
2012-07-12 21:40:29 -06:00
Thomas S Hatch
18ab877907
Merge pull request #1619 from andihit/develop
...
update git.present: add runas option, use shortcut functions
2012-07-12 14:52:56 -07:00
Andreas Gerstmayr
22e1eb2a4d
update ret['changes'] for test-run
2012-07-12 23:50:35 +02:00
Andreas Gerstmayr
22655221ca
update git.present: add runas option, use shortcut functions
2012-07-12 23:44:37 +02:00
Thomas S Hatch
d4c43b0234
Merge pull request #1618 from fabulops/FEATURE-cassandra-module
...
This is an initial module focused on the Cassandra NoSQL database
2012-07-12 14:03:43 -07:00
Adam Garside
d52d28f82f
This is an initial module focused on the Cassandra NoSQL database
...
- http://cassandra.apache.org/
For now, the functions provided are a *mostly* complete informational
and diagnostic suite that may come in handy for those using salt and
cassandra.
Potentially destructive functionality has been left out for now until
I or someone else comes up with an internal orchestration mechanism or
it is decided to let people hang themselves.
- has passed pep8 checks
2012-07-12 16:50:12 -04:00
Thomas S Hatch
ceec4bf254
Add test interface to git.present
2012-07-12 11:57:00 -06:00
Thomas S Hatch
ab7e02544e
Add verbose flag to salt manpage
2012-07-12 11:46:56 -06:00
Thomas S Hatch
d0f12c5b04
Merge pull request #1613 from andihit/develop
...
add git.present state
2012-07-12 09:53:13 -07:00
Andreas Gerstmayr
a0677fa79c
add git.present state
2012-07-12 00:29:02 +02:00
Jeff Schroeder
0b3299b24b
Merge pull request #1611 from andihit/develop
...
fix typo in doc/states tutorial
2012-07-11 12:54:22 -07:00
Andreas Gerstmayr
2ae0097401
fix typo in doc/states tutorial
2012-07-11 21:59:02 +03:00
Thomas S Hatch
2c8f817654
Merge pull request #1609 from bretep/sysconfig_network
...
Sysconfig network
2012-07-10 21:45:19 -07:00
Bret Palsson
fa6d36b6cd
Keep things consistent
2012-07-10 22:23:37 -06:00
Bret Palsson
28e3b94f26
Add support to global networking config
...
Added support for the following:
- nozeroconf
Where setting true disables the zeroconf route.
By default, the zeroconf route (169.254.0.0) is enabled when the system boots. For more information about zeroconf, refer to http://www.zeroconf.org/
- nisdomain:
The NIS domain name.
2012-07-10 22:16:25 -06:00
Thomas S Hatch
d0089b2296
Merge pull request #1607 from jagster02/develop
...
Fixes syndic init failure due to cli attribute error
2012-07-10 18:45:18 -07:00
Thomas S Hatch
36e3ac0559
Merge pull request #1606 from jagster02/develop
...
salt-syndic exec script instantiates a minion rather than a syndic
2012-07-10 18:34:05 -07:00
E.G. Galano
7ee5c07f42
Fixes syndic init failure due to cli attribute error introduced in commit: 3f6b4ac7b8
2012-07-10 18:31:28 -07:00
E.G. Galano
ed4658a7a4
Change salt-syndic exec script to instantiate a syndic class rather than a minion. Fixing the bug introduced in ee0072d3e8
2012-07-10 18:10:17 -07:00
Jeff Schroeder
b339531ade
Merge pull request #1604 from mrud/mru/improve_augeas
...
Mru/improve augeas
2012-07-10 08:20:58 -07:00
Thomas S Hatch
a100eb9406
Merge pull request #1603 from gcw/develop
...
initial wempy template support (json and yaml); minimal testing
2012-07-10 08:18:15 -07:00
Ulrich Dangel
ede5e4ba13
Add augeas module to documentation
2012-07-10 17:08:32 +02:00
Ulrich Dangel
d46f05bf0a
Improve documentation for augeas.setvalue
2012-07-10 17:05:11 +02:00
Ulrich Dangel
a472c57325
Set lstrip_word to private
2012-07-10 17:05:11 +02:00
Jeff Schroeder
39efdf55e3
Merge pull request #1602 from mrud/mru/lsb
...
Try to use lsb_release if module is available. Closes #1601
2012-07-10 07:06:02 -07:00
