Commit Graph

4644 Commits

Author SHA1 Message Date
Baiju Muthukadan
1bbb280581 Add 'See also' section to man pages 2012-05-11 03:40:39 +05:30
Thomas S Hatch
bc9b622e12 Merge pull request #1244 from therek/develop
Fix MAC address handling in FreeBSD
2012-05-10 10:13:22 -07:00
Jeff Hutchins
6f74470dce Use the shell grain as the default 2012-05-10 11:12:31 -06:00
Thomas S Hatch
fc783f543d Add kwargs to apt.upgrade 2012-05-10 11:05:15 -06:00
Thomas S Hatch
5e4fb6fed7 Merge pull request #1247 from jhutchins/1242
Add a no replace option for file.managed state
2012-05-10 10:00:19 -07:00
Thomas S Hatch
98f276f107 cast to a string 2012-05-10 10:57:28 -06:00
Thomas S Hatch
717672fd10 Merge pull request #1243 from jhutchins/choose_shell
Choose shell
2012-05-10 09:55:58 -07:00
Thomas S Hatch
24a669f0ce Merge pull request #1241 from SEJeff/handle-sigusr1
Print a message to the console or /tmp when sent a SIGUSR1
2012-05-10 09:38:13 -07:00
Thomas S Hatch
e1aa31e183 Fix #1238 2012-05-10 09:49:17 -06:00
Thomas S Hatch
4d4d5248e0 Check for transparent objects in file finder, fix # 1236 2012-05-10 09:15:40 -06:00
Cezary Morga
1dff5530a1 Fixed MAC address handling in FreeBSD 2012-05-10 16:05:12 +02:00
Jeff Hutchins
7332af22a9 Add a grain to provide the shell
I'm not sure how this would end up working on Windows.
2012-05-10 07:51:18 -06:00
Jeff Hutchins
633e764ac2 Remove env from wait. 2012-05-10 07:29:47 -06:00
Jeff Hutchins
076feccd4e Fix changing error into string. 2012-05-10 07:28:03 -06:00
Jeff Hutchins
8792a3364f Add a no replace option for file.managed state 2012-05-10 00:20:18 -06:00
Jeff Hutchins
070e4c107d Make the errors return the right way. 2012-05-09 23:55:37 -06:00
Jeff Hutchins
4d2b41ccd0 Remove redundant checking (DRY) 2012-05-09 23:55:04 -06:00
Jeff Hutchins
c58d9aedc2 Add shell checking to cmdmod since shell can be defined. 2012-05-09 23:54:08 -06:00
Jeff Hutchins
620cc3eadc Add shell selection to cmd.run.wait 2012-05-09 23:28:19 -06:00
Jeff Schroeder
23a59c71d1 Cleaning up the publish module integration tests a bit 2012-05-09 21:42:38 -07:00
Jeff Schroeder
a561e224f2 DRY with the grains integration tests 2012-05-09 21:39:49 -07:00
Jeff Schroeder
81fbdc1249 Properly use os.path.join in some integration tests 2012-05-09 21:36:20 -07:00
Jeff Schroeder
6f836afafa Remove a few instances of hardcoded /tmp in code
tempfile.gettempdir() is way better. The gem and rvm states are
still failing, but only because they require the "mock" python
module for running their tests.
2012-05-09 21:29:05 -07:00
Jeff Schroeder
52330d4646 Print a message to the console or /tmp when sent a SIGUSR1
This will print a stacktrace of the currently running code when any
of the salt-minion or salt-master processes are sent a SIGUSR1 signal.
This is for seeing what's going on and to help with debugging.

Minion example:
======== Salt Debug Stack Trace =========
  File "/home/jeff/git/salt/scripts/salt-minion", line 18, in <module>
    main()
  File "/home/jeff/git/salt/scripts/salt-minion", line 15, in main
    minion.start()
  File "/home/jeff/git/salt/salt/__init__.py", line 202, in start
    minion.tune_in()
  File "/home/jeff/git/salt/salt/minion.py", line 510, in tune_in
    time.sleep(0.05)
=========================================

Master watchdog process example:
======== Salt Debug Stack Trace =========
  File "/home/jeff/git/salt/scripts/salt-master", line 17, in <module>
    main()
  File "/home/jeff/git/salt/scripts/salt-master", line 14, in main
    master.start()
  File "/home/jeff/git/salt/salt/__init__.py", line 110, in start
    master.start()
  File "/home/jeff/git/salt/salt/master.py", line 192, in start
    reqserv.run()
  File "/home/jeff/git/salt/salt/master.py", line 304, in run
    self.__bind()
  File "/home/jeff/git/salt/salt/master.py", line 286, in __bind
    zmq.device(zmq.QUEUE, self.clients, self.workers)
=========================================

Master worker example:
======== Salt Debug Stack Trace =========
  File "/home/jeff/git/salt/scripts/salt-master", line 17, in <module>
    main()
  File "/home/jeff/git/salt/scripts/salt-master", line 14, in main
    master.start()
  File "/home/jeff/git/salt/salt/__init__.py", line 110, in start
    master.start()
  File "/home/jeff/git/salt/salt/master.py", line 158, in start
    clear_old_jobs_proc.start()
  File "/usr/lib/python2.6/multiprocessing/process.py", line 104, in start
    self._popen = Popen(self)
  File "/usr/lib/python2.6/multiprocessing/forking.py", line 99, in __init__
    code = process_obj._bootstrap()
  File "/usr/lib/python2.6/multiprocessing/process.py", line 232, in _bootstrap
    self.run()
  File "/usr/lib/python2.6/multiprocessing/process.py", line 88, in run
    self._target(*self._args, **self._kwargs)
  File "/home/jeff/git/salt/salt/master.py", line 145, in _clear_old_jobs
    time.sleep(60)
=========================================

I'm sure there are places missed as this needs a *lot* more testing,
but for the moment, it "works for me TM"
2012-05-09 20:53:53 -07:00
Mike Chesnut
9ec222859e undoing previous changes to setup.py; will handle this in the spec file instead 2012-05-09 11:03:20 -07:00
Mike Chesnut
e31005f69a Merge branch 'develop' of https://github.com/saltstack/salt into etcpkg 2012-05-09 10:43:37 -07:00
Jeff Hutchins
e8947ed868 Add the ability to specify the shell to use. 2012-05-09 10:43:10 -06:00
Jeff Schroeder
f548eea26b Merge pull request #1235 from therek/develop
Develop
2012-05-09 08:33:42 -07:00
Cezary Morga
d583eadb3c Use FreeBSD's kenv(1) command for _hw_data and _virtual 2012-05-09 17:03:19 +02:00
Cezary Morga
7475b2a3eb Merge remote-tracking branch 'upstream/develop' into develop 2012-05-09 15:40:32 +02:00
Cezary Morga
f3bf9c26f6 Display specified jail's configuration 2012-05-09 15:40:09 +02:00
Cezary Morga
5a8e837eee Changed tabs to whitespaces 2012-05-09 15:13:41 +02:00
Cezary Morga
0b8f5b62ea Missing brackets 2012-05-09 15:09:46 +02:00
Cezary Morga
463dc8a77f If no jail name specified act on all 2012-05-09 15:01:29 +02:00
Jeff Schroeder
ba2ed5a71a Merge pull request #1233 from herlo/master
Updated salt.spec to latest release
2012-05-09 05:58:23 -07:00
Cezary Morga
0dda449d4c First take at jail management module for FreeBSD 2012-05-09 14:48:58 +02:00
Mike Chesnut
337f06e271 adding /etc/salt template files to setup.py so they get packaged 2012-05-08 17:38:49 -07:00
Kurtis Velarde
bec0ee0340 Seeing if we can get pkgng to work with salt 2012-05-08 16:57:05 -07:00
Clint Savage
7955098f29 updated salt.spec to use 0.9.9.1 2012-05-08 14:01:11 -06:00
Thomas S Hatch
2485de0367 Merge pull request #1230 from uggedal/develop
Make onlyif and unless run with the same settings as the cmd itself.
2012-05-08 08:38:02 -07:00
Eivind Uggedal
fbca927deb Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-05-08 17:10:32 +02:00
Eivind Uggedal
188545b7f4 Make onlyif and unless run with the same settings as the cmd itself.
The unless and onlyif checks should be executed with the same working
directory, user, group, shell, and environment as the command itself.
Take this example for instance:

createuser --no-superuser --no-createdb --no-createrole joe:
  cmd.run:
    - unless: psql --tuples-only -c 'SELECT rolname FROM
              pg_catalog.pg_roles;' | grep '^joe$'
    - user: postgres

Before this fix this state will fail during the unless check since its
beeing executed by root in a normal PostgreSQL setup.

In addition a bug where the effective gid was not reset when the
state returned early was fixed.
2012-05-08 16:57:19 +02:00
Thomas S Hatch
c1a455a6b2 Merge pull request #1229 from knine/develop
Added methods to set max days, min days, warn days, and inactive days
2012-05-07 22:15:04 -07:00
Thomas S Hatch
c19c20a878 Merge pull request #1228 from jeamland/patch-1
Make it clearer that a user-switch error can be solved through a configuration change
2012-05-07 22:07:58 -07:00
Jacob Albretsen
889d5d2fac Added methods to shadow to set max days, min days, warn days, and inactive days. 2012-05-07 22:59:25 -06:00
Benno Rice
f00a8da35c The current error message when salt is configured (as it is by default) to run as root suggests that salt can _only_ be run as root. Change this to point out that it is simply unable to switch to the target user and thus suggest that the user can be changed via configuration. 2012-05-08 14:52:15 +10:00
Thomas S Hatch
1fac953ea3 Merge pull request #1222 from baijum/code_coverage_outputs
ignore code coverage outputs
2012-05-07 07:10:07 -07:00
Baiju Muthukadan
58a44cb100 ignore code coverage outputs
Added code coverage outputs genereated by
coverage.py to .gitignore .  To generate code
coverage report, run this command:

  coverage run tests/runtests.py

To produce HTML coverage repot (`htmlcov/index.html`):

  coverage html --omit=tests/*

To produce Cobertura compliant XML for Jenkins:

  coverage xml --omit=tests/*
2012-05-07 17:08:48 +05:30
Thomas S Hatch
d2ccea1991 Merge pull request #1221 from 0xDEC0DE/develop
setup.py falls down, goes boom when building package for Debian Squeeze
2012-05-06 21:21:31 -07:00
Nicolas Simonds
328486caa6 setup.py falls down, does boom when building package for Debian Squeeze 2012-05-06 20:25:14 -07:00