valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
17,446 Commits 24 Branches 182 Tags 341 MiB
0f1e72f2ee
Commit Graph

17446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henrik Holmboe
0252dcd535 Configuration file for SuSEfirewall2 used in openSUSE 
This should probably be looked over by the Suse RPM package maintainer.
Untested on SLES.
 2013-09-04 14:34:48 +02:00
mickey
13c8be0c61 Added additional mknod logic and a dictionary return object 2013-09-04 06:14:06 -05:00
mickey
c356c07a67 Merge remote-tracking branch 'upstream/develop' into feature_mknod 2013-09-04 05:40:44 -05:00
Ajith Antony
2df0d02bd7 Parse backing file from qemu-image info output 
I'm deplying thin clones of VM's using the qcow2 disk format.  One of the lines
of the qemu-image info command reports the filename of the base disk.

   $ qemu-img info /work/aantony/kvm/ajith-sl6-2.qcow2
   image: /work/aantony/kvm/ajith-sl6-2.qcow2
   file format: qcow2
   virtual size: 20G (21474836480 bytes)
   disk size: 1.0G
   cluster_size: 65536
   backing file: ./ajith-sl6-base-image.qcow2 (actual path: /work/aantony/kvm/./ajith-sl6-base-image.qcow2)

This last line is breaking the yaml parser:

   backing file: ./ajith-sl6-base-image.qcow2 (actual path: /work/aantony/kvm/./ajith-sl6-base-image.qcow2)

   ScannerError: mapping values are not allowed here
     in "<string>", line 6, column 51:
        ... l6-base-image.qcow2 (actual path: /work/aantony/kvm/./ajith-sl6- ...

This change aims to at least parse that line.

Results look like this:

  ----------
    ----------
    ajith-sl6-2:
        ----------
        cpu:
            1
        cputime:
            6383750000000
        disks:
            ----------
            hda:
                ----------
                backing file:
                    /work/aantony/kvm/./ajith-sl6-base-image.qcow2
                cluster_size:
                    65536
                disk size:
                    1.0G
                file:
                    /work/aantony/kvm/ajith-sl6-2.qcow2
                file format:
                    qcow2
                image:
                    /work/aantony/kvm/ajith-sl6-2.qcow2
                virtual size:
                    20G (21474836480 bytes)
     <...>
 2013-09-04 02:31:15 -05:00
Thomas S Hatch
8f996b7eee Merge pull request #7028 from s0undt3ch/hotfix/me-kill-threads 
Kill logging records dispatcher thread
 2013-09-03 23:17:07 -07:00
Pedro Algarvio
9bb4e9de0a Capitalize. 2013-09-04 07:13:54 +01:00
Pedro Algarvio
81bdb3c33b Kill the extended logging handlers threaded log record dispatcher. 
Slow logging handlers **will** slow down salt.
 2013-09-04 07:10:30 +01:00
Pedro Algarvio
619fa529ba Handle HWM setting for ZMQ >= 3.0 2013-09-04 07:09:40 +01:00
Thomas S Hatch
165b925b28 TODONE 2013-09-03 23:42:56 -06:00
Thomas S Hatch
1fd4c45416 Clean up some routines from refactoring 2013-09-03 23:42:56 -06:00
Thomas S Hatch
bc524f7e6e handle changes to cmd_block 2013-09-03 23:42:56 -06:00
Ajith Antony
a82643cc46 subprocess.Popen takes a PIPE for stdin 
http://docs.python.org/2/library/subprocess.html#subprocess.Popen.communicate

   Note that if you want to send data to the process’s stdin, you need to
   create the Popen object with stdin=PIPE.
 2013-09-04 00:13:05 -05:00
Pedro Algarvio
4d1b66959b Merge pull request #7025 from terminalmage/quickfix 
Move import to make it less confusing
 2013-09-03 22:01:50 -07:00
Thomas S Hatch
0ee02a26d4 fix ssh wrapper loading 2013-09-03 21:54:53 -06:00
Thomas S Hatch
fa8dee96c6 Merge pull request #7021 from s0undt3ch/develop 
Don't fail if unable to change back to the old CWD.
 2013-09-03 20:49:02 -07:00
Pedro Algarvio
b598936e05 Don't try to sync with non existing temp loggers. 2013-09-04 04:46:50 +01:00
David Boucha
9549e33406 Merge pull request #7022 from s0undt3ch/hotfix/seed-cli-examples 
Add missing `CLI Example` headers to the examples.
 2013-09-03 20:21:54 -07:00
Erik Johnson
b3736561de Move import to make it less confusing 
An imported function, _parse_pkginfo(), requires the collections module.
It has been removed a couple times, causing regressions each time. Since
it is needed in just one place, this commit moves the import where it is
needed and includes a warning not to remove it.

See https://github.com/saltstack/salt/pull/7017#issuecomment-23757320
for more info.
 2013-09-03 22:19:03 -05:00
Thomas S Hatch
c3c0f42d89 Clean up state ssh wrapper module 2013-09-03 21:00:13 -06:00
Thomas S Hatch
fd80937df8 locallize state routines for ssh based clients 2013-09-03 20:59:59 -06:00
Erik Johnson
8bfee96948 Remove unused variables 2013-09-03 21:52:10 -05:00
Pedro Algarvio
7dbb7afb7c Add missing CLI Example headers to the examples. 2013-09-04 03:51:37 +01:00
Erik Johnson
a9174db08c Fix mine.send 
For functions that use arguments, mine.send is broken due to bugs in
salt.utils.arg_lookup() and salt.utils.format_call(). This commit
restores proper functionality.
 2013-09-03 21:43:58 -05:00
Pedro Algarvio
26514de003 Don't fail if unable to change back to the old CWD. 2013-09-04 03:29:00 +01:00
Joe Healy
9e65e208c4 Moved operation section nearer the top to give a high level overview 
before diving in.
 2013-09-04 11:35:37 +10:00
Joe Healy
282e5a813f further doc tweaks 2013-09-04 11:33:51 +10:00
Thomas S Hatch
aa225bfbcd Add pillar generation to salt-ssh 2013-09-03 18:45:26 -06:00
Thomas S Hatch
9ffb8ea8a3 Merge pull request #7017 from pscripter/develop 
Bugfix for interacting with yum -- bug seen on CentOS 6.4, with Python 2...
 2013-09-03 16:42:48 -07:00
Thomas S Hatch
f8553e70d6 Merge pull request #7015 from s0undt3ch/develop 
Only get the tags which match salt's version tags formatting.
 2013-09-03 16:41:36 -07:00
Pedro Algarvio
50400e1487 Only get the tags which match salt's version tags formatting. 2013-09-04 00:37:59 +01:00
Jared W. Robinson
06650c6cb5 Bugfix for interacting with yum -- bug seen on CentOS 6.4, with Python 2.6 using pkg.installed.sources. 2013-09-03 17:24:03 -06:00
Thomas S Hatch
ae2a71457c Merge pull request #7012 from mgwilliams/lxc 
lxc: use gen_mac from salt.utils
 2013-09-03 14:51:38 -07:00
Matthew Williams
b5a7b47eab Merge branch 'develop' into lxc 2013-09-03 21:46:57 +00:00
Thomas S Hatch
8610c832a8 Merge pull request #7010 from mgwilliams/docs 
tweak docstrings
 2013-09-03 14:39:15 -07:00
Matthew Williams
ce9fe2ae23 lxc: use gen_mac from salt.utils 2013-09-03 21:37:15 +00:00
Matthew Williams
98534dc000 Merge branch 'develop' into lxc 2013-09-03 21:35:28 +00:00
Thomas S Hatch
77ea5d47c7 silly pylint fix 2013-09-03 14:58:39 -06:00
Thomas S Hatch
cc20c34da3 fix bad ref to the minion's opts 2013-09-03 14:26:08 -06:00
Matthew Williams
ef1a4e5eb0 ps: tweak docstrings 2013-09-03 20:23:18 +00:00
Thomas S Hatch
66d6b22d17 Add initial state wfunc module 2013-09-03 14:23:06 -06:00
Thomas S Hatch
56e2777803 Add arg passing to wrapper funcs from top level 2013-09-03 14:23:05 -06:00
Matthew Williams
ee692c103c Merge branch 'lxc' into docs 2013-09-03 20:20:32 +00:00
Matthew Williams
21cd4cccc0 lxc: tweak docstring 2013-09-03 20:19:10 +00:00
Thomas S Hatch
bad62e5d16 Merge pull request #7009 from mgwilliams/lxc 
add lxc module
 2013-09-03 13:17:33 -07:00
Thomas S Hatch
39832dbc04 Merge pull request #7008 from mgwilliams/seed 
move seed functions into seed module from img
 2013-09-03 13:15:19 -07:00
Thomas S Hatch
15bd86ea4c Merge pull request #7007 from mgwilliams/ps 
docstring formatting in ps module and whitespace removal
 2013-09-03 13:14:30 -07:00
Thomas S Hatch
73b5f22bb6 Merge pull request #7006 from s0undt3ch/hotfix/remove-catchall-exception 
Remove miss-leading exception.
 2013-09-03 13:12:53 -07:00
Thomas S Hatch
f289c26779 Merge pull request #7005 from s0undt3ch/develop 
Remove extra white-space.
 2013-09-03 13:11:28 -07:00
Matthew Williams
82005f1230 add lxc module 2013-09-03 20:04:23 +00:00
Pedro Algarvio
268b5f29d2 Remove miss-leading exception. 2013-09-03 20:57:29 +01:00