Thomas S Hatch
2bff6cb455
Merge pull request #1595 from blast-hardcheese/develop
...
Disabled initial socket bind check
2012-07-09 08:10:58 -07:00
Jeff Schroeder
dc6c4c7eea
Merge pull request #1596 from avimar/git-clone-empty-folder
...
When GIT cloning to existing but empty folder, automatically delete it.
2012-07-09 05:13:42 -07:00
Avi Marcus
0c5667c484
Rework error messages. When cloning to existing but folder, automatically delete it.
2012-07-09 12:13:37 +03:00
Devon Stewart
e8ec604c23
Fixing a typo
...
Currently not an issue, since the value is never read, but this should
make it more obvious what to do to re-enable the check in the future.
2012-07-09 01:56:04 -07:00
Devon Stewart
20cdbfbe55
Disabled socket bind check as per github issue #1594
2012-07-09 01:52:01 -07:00
Thomas S Hatch
b0dcb79486
Fix opts
2012-07-09 00:51:15 -06:00
Thomas S Hatch
89499be351
Configure virtualenv via pilar
2012-07-09 00:39:46 -06:00
Thomas S Hatch
f54b2df7e5
Allow postgress to be configured via pillar
2012-07-09 00:35:16 -06:00
Thomas S Hatch
c3409a699e
Allow gen config from pillar
2012-07-09 00:29:17 -06:00
Thomas S Hatch
9f60f0b93f
Fix gem module to use single quotes like the rest of Salt
2012-07-09 00:26:21 -06:00
Thomas S Hatch
172a0f1fd9
Allow aliases file to be defined in pillar
2012-07-09 00:18:02 -06:00
Thomas S Hatch
022c51c0bc
Can now pass mysql options in pillar, Fix #1442
2012-07-09 00:13:40 -06:00
Thomas S Hatch
91a4c3fb9b
Fix #1584
2012-07-08 23:24:17 -06:00
Thomas S Hatch
48b61db57e
Merge pull request #1593 from intchanter/develop
...
Develop
2012-07-08 22:05:19 -07:00
Intchanter
f663dd2c46
Merge branch 'develop' of https://github.com/saltstack/salt into develop
...
Conflicts:
salt/states/network.py
setup.py
tests/integration/__init__.py
2012-07-08 22:50:12 -06:00
Thomas S Hatch
fcf188eeaa
Merge pull request #1592 from cluther/develop
...
Support pkg module on Amazon Linux.
2012-07-08 20:49:07 -07:00
Chet Luther
84ddc730b8
Support pkg module on Amazon Linux.
2012-07-09 03:43:42 +00:00
Thomas S Hatch
cf8de06b8b
Merge pull request #1591 from avimar/1122
...
add "reload" method for ubuntu's upstart
2012-07-08 20:24:22 -07:00
Avi Marcus
1e7927cccb
added function reload for ubuntu's upstart service manager
2012-07-08 22:05:22 +03:00
Avi Marcus
f3d4fbc993
Revert "added function reload for ubuntu's upstart service manager"
...
This reverts commit 390fc64b4b
2012-07-08 22:04:21 +03:00
Avi Marcus
b5440b938a
Merge branch 'develop' of https://github.com/saltstack/salt into 1122-ubuntu
2012-07-08 21:53:14 +03:00
Avi Marcus
390fc64b4b
added function reload for ubuntu's upstart service manager
2012-07-08 21:53:00 +03:00
Thomas S Hatch
3787870a1f
Remove deprecated hiera function
2012-07-08 00:56:30 -06:00
Thomas S Hatch
c388ff3f89
Add hiera ext_pillar
2012-07-08 00:55:39 -06:00
Thomas S Hatch
0f335c3447
detatch old ext_pillar functions
2012-07-08 00:44:33 -06:00
Thomas S Hatch
99e4d6d3ad
make the cmd_yaml pillar work
2012-07-08 00:43:47 -06:00
Thomas S Hatch
68c543f87d
Pack the module functions into ext_pillar modules
2012-07-08 00:38:06 -06:00
Thomas S Hatch
66dec71883
kill stray print statement
2012-07-08 00:11:03 -06:00
Thomas S Hatch
eec38c85dd
point to the correct pillar module dir
2012-07-08 00:09:28 -06:00
Thomas S Hatch
95e86a923e
fix ext_pillars reference
2012-07-08 00:09:07 -06:00
Thomas S Hatch
4b5474db19
Add new pillar loader directory to setup.py
2012-07-07 23:57:08 -06:00
Thomas S Hatch
34fb85f38a
Hook ext_pillar method into loader interfaces
2012-07-07 23:51:24 -06:00
Thomas S Hatch
40937a354b
Add cmd_yaml ext_pillar module
2012-07-07 23:50:47 -06:00
Thomas S Hatch
b98adb2c6e
Minor comment added
2012-07-07 22:59:54 -06:00
Thomas S Hatch
738e77896b
Move pillar into module dir
2012-07-07 22:43:43 -06:00
Thomas S Hatch
e446a306c7
Add sock_dir verification to tests
2012-07-07 22:11:36 -06:00
Thomas S Hatch
d8351ffa0d
some spacing and style fixes
2012-07-07 21:14:21 -06:00
Thomas S Hatch
d465d5149e
Merge pull request #1588 from blast-hardcheese/develop
...
git state should report "changed" on first clone, also adding git.submodule
2012-07-07 19:59:30 -07:00
Devon Stewart
77378323dd
Adding git.submodule (and associated state option)
...
This should make git more useful for larger projects
2012-07-06 19:13:41 -07:00
Devon Stewart
0e237f8caa
git state should report "changed" on first clone
...
Was trying to write a state that recompiled when the repo changed,
without something like this it wouldn't compile the first time it was
cloned
2012-07-06 17:52:07 -07:00
Jeff Schroeder
f0797390c7
Merge pull request #1587 from blast-hardcheese/develop
...
"git checkout" needs to be run as "runas"
2012-07-06 16:50:51 -07:00
Devon Stewart
f57034a936
"git checkout" needs to be run as "runas"
...
Any files created when switching branches were owned by root, which
makes the directory effectively unusable by the intended user.
2012-07-06 16:43:26 -07:00
Thomas S Hatch
f1230fe8b9
Merge pull request #1586 from bretep/network_bonding
...
Use the more intelligent way of formatting strings
2012-07-06 09:13:06 -07:00
Bret Palsson
697a282525
Use the more intelligent way of formatting strings
...
Reasons for the change:
- Required for python 3.x
- Support added in python 2.5
- Way more flexible
- The salt way of formatting strings
- Just plain awesome
2012-07-06 10:00:02 -06:00
Thomas S Hatch
656f5fb142
Merge pull request #1585 from bretep/network_bonding
...
Network bonding
2012-07-06 08:23:24 -07:00
Bret Palsson
cb37ea9021
Merge branch 'develop' of git://github.com/saltstack/salt into network_bonding
2012-07-06 03:26:07 -06:00
Bret Palsson
ea3a03f3f5
Search for bond interface in modprobe.conf
2012-07-06 03:12:30 -06:00
Bret Palsson
37a8488c5a
Simple syntax error.
2012-07-06 02:50:10 -06:00
Bret Palsson
3e58273f81
Add support for EL5. Already supports EL6
...
- EL5 needs to have bonding options in the /etc/modprobe.conf vs. a configuration file under /etc/modprobe.d
- Quotes needed to be removed from the ifcfg scripts for most options.
2012-07-06 02:44:57 -06:00
Thomas S Hatch
d34c61fce6
Add the sock_dir to the verify_env on the minion
2012-07-06 01:19:08 -06:00
