Commit Graph

3971 Commits

Author SHA1 Message Date
Thomas S Hatch
b96c3d8364 fix regresion for #595 2012-04-01 13:04:28 -06:00
Thomas S Hatch
914c986bca Add get_template to the file client 2012-04-01 12:56:24 -06:00
Thomas S Hatch
5a43f80a1d Merge pull request #1031 from teancom/develop
Don't error out if a VM image file doesn't exist in virt.py
2012-03-31 23:16:30 -07:00
David Bishop
f273d011fb change to using CommandExecutionError in virt.py to supress ugly exception in the case of a missing VM 2012-03-31 23:11:04 -04:00
David Bishop
1a33d25822 add vm_state to return the state of a given vm 2012-03-31 23:08:17 -04:00
David Bishop
7b99f822a9 Don't error out if a VM image file doesn't exist in virt.py 2012-03-31 19:43:06 -04:00
Thomas S Hatch
b5b99061fe Merge pull request #1030 from teancom/develop
Allow integrated software to read keys
2012-03-31 14:13:58 -07:00
Thomas S Hatch
97e5487e49 Merge pull request #1029 from fatbox/timeout-valueerror
Handle ValueError's when parsing 'tmo' with int()
2012-03-31 14:11:40 -07:00
David Bishop
63cb51a2e0 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2012-03-31 17:06:03 -04:00
David Bishop
58856b5d69 allow the pki dir to have 750 permissions, add logging if unable to set permissions correctly 2012-03-31 17:05:55 -04:00
Evan Borgstrom
3544d580f4 Handle ValueError's when parsing 'tmo' with int()
This is a rather obscure one but it just bit us so I figured we should
fix it.

A recent change to our code that invokes salt through the Python API
ended up doing this:

    ret = minion.functions['publish.publish'](self.name, fun, *args, **kwargs)

When we really meant to do this:

    ret = minion.functions['publish.publish'](self.name, fun, arg=args, **kwargs)

What made this difficult to track down was that the master would just
silently die when this happened. Once we ran it in debug mode we found
the following exception:

    16:14:30,049 [salt.master    ][INFO    ] AES payload received with command minion_publish
    Process MWorker-5:
    Traceback (most recent call last):
      File "/usr/lib/python2.6/multiprocessing/process.py", line 232, in _bootstrap
        self.run()
      File "/usr/lib/python2.6/dist-packages/salt/master.py", line 368, in run
        self.__bind()
      File "/usr/lib/python2.6/dist-packages/salt/master.py", line 317, in __bind
        ret = self.serial.dumps(self._handle_payload(payload))
      File "/usr/lib/python2.6/dist-packages/salt/master.py", line 335, in _handle_payload
        'clear': self._handle_clear}[key](load)
      File "/usr/lib/python2.6/dist-packages/salt/master.py", line 362, in _handle_aes
        return self.aes_funcs.run_func(data['cmd'], data)
      File "/usr/lib/python2.6/dist-packages/salt/master.py", line 775, in run_func
        ret = getattr(self, func)(load)
      File "/usr/lib/python2.6/dist-packages/salt/master.py", line 722, in minion_publish
        timeout = int(clear_load['tmo'])
    ValueError: invalid literal for int() with base 10: ',00:16:36:9d:d9:30,'

With these changes the master will now log a warning and return gracefully.

Also, I fixed a small syntax error that suggested clear_load was a function.
2012-03-31 16:38:03 -04:00
Thomas S Hatch
b0b87a6ce7 Make file templates more flexible + pull the code out of the file state
This change makes it so that kwargs can be passed to templates and they
are loaded up with the correct data. This also repairs the mako template
system
2012-03-31 12:05:29 -06:00
Thomas S Hatch
f67cab838a fix bug in cython autoloading 2012-03-31 10:49:27 -06:00
Thomas S Hatch
28f4cc0ab1 Make minion hold off for network connection 2012-03-30 22:48:00 -06:00
Thomas S Hatch
8c3ad656dc Add logrotate files to pkg dir 2012-03-30 21:54:47 -06:00
Thomas S Hatch
c2ee45795a update win_file.find to use kwargs 2012-03-30 21:46:17 -06:00
Thomas S Hatch
3a6ce142d1 update file.find to use kwargs, Fix #1024 2012-03-30 21:42:47 -06:00
Thomas S Hatch
75a1b385e9 Change kwargs to gather all kwargs if function has **kwargs 2012-03-30 21:41:34 -06:00
Thomas S Hatch
92d1a68710 Add pillar data to SMinon class, Fix #1027 2012-03-30 17:39:16 -06:00
Seth House
9cd35f3900 Merge pull request #1026 from fxdgear/develop
show packages in pip.list that were installed via the editable flag
2012-03-30 01:12:35 -07:00
Nick Lang (Salt minion)
cb49434ae3 Merge branch 'develop' of github.com:fxdgear/salt into develop 2012-03-30 07:32:56 +00:00
Nick Lang (Salt minion)
48286a8d5f show packages in pip.list that were installed via the editable flag 2012-03-30 07:32:48 +00:00
Thomas S Hatch
d00133e343 Add some tests for states 2012-03-29 17:18:32 -06:00
Thomas S Hatch
24bc642508 Add files to file_roots for tests 2012-03-29 16:53:48 -06:00
Thomas S Hatch
2d81528eaa Add file_roots config to tests 2012-03-29 16:51:56 -06:00
Thomas S Hatch
47768c7149 Add pillar module verification 2012-03-29 16:35:49 -06:00
Thomas S Hatch
6dadf88000 Add pillar data to tests 2012-03-29 16:19:19 -06:00
Thomas S Hatch
9cedfe7c95 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-03-29 15:46:38 -06:00
Thomas S Hatch
d1dee6d4e3 remove old master process fix 2012-03-29 15:41:32 -06:00
Jeff Schroeder
ff21718d96 Merge pull request #1023 from stephas/develop
OS X and kvm module disable
2012-03-29 12:50:41 -07:00
Stephan Scheller
ec9889b7e2 Per SEJeff's comment, disabled kvm_hyper module for OS X correctly 2012-03-29 12:22:23 -07:00
Stephan Scheller
30af318e8b There is no /proc/modules on OS X, fixed kvm_hyper module from crashing 2012-03-29 11:42:54 -07:00
Thomas S Hatch
d643db9154 remove misconfigured file_roots lines 2012-03-29 09:37:11 -06:00
Thomas S Hatch
bb356df777 Add docs for refresh_pillar, Fix #1020 2012-03-29 08:58:32 -06:00
Thomas S Hatch
53befac5e8 Add a syndic, syndic master and finish synndic tests 2012-03-29 01:03:37 -06:00
Thomas S Hatch
cda5dfbf4d update configs for syndic tests 2012-03-29 01:03:11 -06:00
Thomas S Hatch
fac809f11a add initial files for syndic tests 2012-03-29 01:02:40 -06:00
Thomas S Hatch
9d0f49e2bf Add a SyndicCase for testing syndic functions 2012-03-28 22:25:59 -06:00
Thomas S Hatch
f06ea9335d Update tests to run an extra master and a syndic 2012-03-28 22:14:31 -06:00
Thomas S Hatch
1e63ffc862 Add syndic master config for the test environment 2012-03-28 22:13:34 -06:00
Thomas S Hatch
7221d566e5 Add auth test for minion publish 2012-03-28 18:47:10 -06:00
Thomas S Hatch
62b709d578 publish tests 2012-03-28 18:37:05 -06:00
Thomas S Hatch
ecfb4b1df0 update config for publish tests 2012-03-28 18:36:38 -06:00
Thomas S Hatch
bc9441c091 this is causing an exception, changing back until it can be hunted down 2012-03-28 18:25:28 -06:00
Thomas S Hatch
f37725fff3 fix break in publish caused by hashed jid dirs 2012-03-28 18:18:27 -06:00
Thomas S Hatch
d47ae03947 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-03-28 14:29:37 -06:00
Thomas S Hatch
12a0f442ec fix string standards and use yaml.safe_load 2012-03-28 14:29:00 -06:00
Thomas S Hatch
af18d2da7f Merge pull request #1019 from fatbox/mysql-grant-fix
Only escape the database name, not the table
2012-03-28 13:14:54 -07:00
Evan Borgstrom
1263b266b3 Only escape the database name, not the table
As per http://dev.mysql.com/doc/refman/5.1/en/grant.html you can only
specify wildcards in the database part of the specification for the
grant.

As it stands right now when the grant is generated it is for a table
with backticks in the name. This leads to the confusing situation where
the user can access the database but cannot access any tables.
2012-03-28 16:12:23 -04:00
Thomas S Hatch
e3fe0c05fc Merge branch 'develop' of github.com:saltstack/salt into develop 2012-03-28 12:08:13 -06:00