valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,628 Commits 24 Branches 182 Tags 341 MiB
3e09839529
Commit Graph

7628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
fe14c46f60 Fix #2473 2012-11-07 09:10:14 -07:00
Sean Channel
e22349b8cd eschew upstart style commands 2012-11-07 08:09:52 -08:00
Pedro Algarvio
cae00911a5 One more try to properly handle the process termination. 2012-11-07 14:10:02 +00:00
Pedro Algarvio
b4f2ad2884 Never fail on process.terminate() since the process is supposed to have ended. 2012-11-07 13:58:44 +00:00
Pedro Algarvio
8e9fd09eeb Try to cleanup after ourselves. 
* Only instantiate a `LocalClient` on a test if one is required.
* Try to precipitate garbage collection on our minions connect and sync multi-processes.
 2012-11-07 13:40:39 +00:00
Thomas S Hatch
a3f639824e Merge pull request #2472 from ryanschneider/cp-templates 
Add template support to cp.get_file paths
 2012-11-06 21:38:48 -08:00
Ryan Schneider
ae6347386d Cleanup temp file used in rendering paths 2012-11-06 19:36:51 -08:00
Ryan Schneider
721bce0a11 Fixed integration test 2012-11-06 19:36:51 -08:00
Ryan Schneider
49fb321254 Add integration test 2012-11-06 19:36:51 -08:00
Ryan Schneider
deaf32b877 Add template rendering to cp.get_file src/dest 2012-11-06 19:36:51 -08:00
Sean Channel
f23571bcf7 Merge pull request #2471 from seanchannel/develop 
undo package dep. change
 2012-11-06 19:21:10 -08:00
Thomas S Hatch
7a3be8b080 Merge pull request #2470 from giantlock/develop 
freebsdservice improvement
 2012-11-06 16:30:43 -08:00
Denis Generalov
b7880f10b0 *) get_enabled() and get_all(): avoid hardcoded pathes 
*) enable() and disable(): common internals moved to _switch()
   config argument added
 2012-11-07 04:05:32 +04:00
Thomas S Hatch
2bf06da973 Merge pull request #2469 from FireHost/fix_file_symlink_no_force_error 
Fix NoneType error in file._symlink_check()
 2012-11-06 15:57:53 -08:00
Aaron Tygart
0a7e4814ec Fix NoneType error in file._symlink_check() 2012-11-06 17:22:08 -06:00
Thomas S Hatch
e8f04a7f32 Network strings should be indented 2012-11-06 16:17:25 -07:00
Sean Channel
2ea8b7e061 undo dep. change 2012-11-06 13:05:51 -08:00
Pedro Algarvio
c5c637154a Try to get some system information out of Travis-CI. 2012-11-06 18:11:26 +00:00
Thomas S Hatch
aa82ba5f6b Merge pull request #2465 from jonasvp/fix_postgres_error 
Postgres fails if username is the empty string
 2012-11-06 08:50:56 -08:00
Pedro Algarvio
af7ebf12f8 Try not to fail on travis-ci under python 2.6 
* Raised max open files by 1024 since running in a vagrant machine 2048 was not enough, though, I think travis-ci defaults to a higher value.
* Wait a bit longer on the events testing.
* Separated the initial minions connected and minions synced into two different events and functions. Also corrected the `if` expected value when a timeout occurs.
 2012-11-06 16:02:36 +00:00
Seth House
818858c023 Added a documentation reference section on Salt internals 
This sections should collect documentation on how Salt is organized
internally and where interesting/important bits of the code reside.

Refs #2417
 2012-11-06 08:56:37 -07:00
Jonas
d78a174643 Postgres fails if username is the empty string 
This could be a side effect of 351b5b6, where config.option
was introduced. Since we don't need to pass in the empty string
anyway, a simple "if" should be fine.
 2012-11-06 15:41:12 +01:00
Pedro Algarvio
e04c872c66 Convert the remaining tests hard-coding temporary paths. 2012-11-06 12:44:53 +00:00
Pedro Algarvio
e2168602fb Allow passing multiple path elements to construct a path. 2012-11-06 12:15:24 +00:00
Pedro Algarvio
739eeac30d Create an "alias" for temfile.gettempdir() to reduce calls to it. 2012-11-06 12:14:02 +00:00
Pedro Algarvio
bb6cb62901 Switched runtests_helpers.get_temp_dir_for_path to runtests_helpers.get_salt_temp_dir_for_path. 2012-11-06 11:32:48 +00:00
Pedro Algarvio
75644992e2 Don't hard-code temporary paths on tests. Refs #2462. 2012-11-06 11:20:06 +00:00
Thomas S Hatch
44dab902d0 Merge pull request #2461 from giantlock/develop 
fix string formatting
 2012-11-05 22:09:44 -08:00
Thomas S Hatch
77b5df70e5 Merge pull request #2460 from UtahDave/fix_top_file_requirement 
Fixes #2376 Remove requirement for a topfile entry.
 2012-11-05 20:28:34 -08:00
Thomas S Hatch
0576bd97c4 Merge pull request #2459 from UtahDave/fix_nova_virtual 
Add virtual function for nova.py
 2012-11-05 20:26:15 -08:00
Thomas S Hatch
44bc8f47f6 Merge pull request #2458 from FireHost/scientific_linux_os_grain 
Add os grain mapping for 'Scientific Linux'
 2012-11-05 20:16:19 -08:00
Thomas S Hatch
508849bda6 Merge pull request #2457 from techhat/develop 
Adding flavor functions and image_list to nova
 2012-11-05 20:06:21 -08:00
saltstack
144e1bdcb5 Fixes #2376 Remove requirement for a topfile entry. 
Previously if your topfile was empty state.highstate
would fail even if your master_tops returned states
that apply
 2012-11-05 18:29:24 -07:00
David Boucha
a02fcea49c Add virtual function for nova.py 
All modules should have __virtual__ function
 2012-11-05 17:41:45 -07:00
Joseph Hall
3963dea390 Add ability to modify nova image metadata 2012-11-05 16:26:18 -07:00
Aaron Tygart
2c578fd76a Add os grain mapping for 'Scientific Linux' 2012-11-05 16:20:40 -06:00
Joseph Hall
28f04d1ca1 Adding image_list (and updating flavor_list) 2012-11-05 15:17:37 -07:00
Joseph Hall
3dd91b4127 Added create and delete functions for nova 2012-11-05 15:02:43 -07:00
Sean Channel
1f8d36431b Merge pull request #2456 from seanchannel/develop 
switch to depending on zm3 for debian package
 2012-11-05 14:01:23 -08:00
Sean Channel
75f2a58b4e switch to depending on zm3 for debian package 2012-11-05 13:54:13 -08:00
Joseph Hall
62ff45c745 Technically, nova is using keystone authentication here 2012-11-05 14:21:59 -07:00
Denis Generalov
9d80606989 fix string formatting 2012-11-06 01:04:24 +04:00
Thomas S Hatch
c1b8b0b53d Merge pull request #2453 from techhat/master 
Adding basic openstack nova module
 2012-11-05 11:39:56 -08:00
Thomas S Hatch
c71335a40b Merge pull request #2452 from giantlock/develop 
bring interface of freebsdservice in order according modules/service.py
 2012-11-05 11:35:55 -08:00
Thomas S Hatch
87cefbbb99 Merge pull request #2451 from twinshadow/patch-2 
Update salt/modules/network.py: get all interfaces for the `ip` command
 2012-11-05 11:31:40 -08:00
Joseph Hall
b5e7983905 Adding basic openstack nova module 2012-11-05 11:04:38 -07:00
Denis Generalov
28be897847 *) add functions enable(name), disable(name), enabled(name), disabled(name) according common service interface. 
*) fix pep8 typo
 2012-11-05 21:06:04 +04:00
Anthony Cornehl
ca41f7081e Update salt/modules/network.py 
The `ip address` command does not list interfaces that are not up/configured. It now gets the output from the `ip link` command as well for those interfaces.

Before:
<pre>
{'brynhilde': {'eth1': {'hwaddr': '00:30:48:34:2a:cb',
                        'inet': [{'address': '10.7.161.4',
                                  'broadcast': '10.7.175.255',
                                  'label': 'eth1',
                                  'netmask': '255.255.240.0'}],
                        'inet6': [{'address': '2620:0:170:9900:230:48ff:fe34:2acb',
                                   'prefixlen': '64'},
                                  {'address': 'fe80::230:48ff:fe34:2acb',
                                   'prefixlen': '64'}],
                        'up': True},
               'eth4': {'hwaddr': '00:02:c9:32:06:30',
                        'inet': [{'address': '75.75.11.23',
                                  'broadcast': '75.75.11.255',
                                  'label': 'eth4',
                                  'netmask': '255.255.255.0'}],
                        'inet6': [{'address': 'fe80::202:c9ff:fe32:630',
                                   'prefixlen': '64'}],
                        'up': True},
               'lo': {'hwaddr': '00:00:00:00:00:00',
                      'inet': [{'address': '127.0.0.1',
                                'broadcast': None,
                                'label': 'lo',
                                'netmask': '255.0.0.0'}],
                      'inet6': [{'address': '::1', 'prefixlen': '128'}],
                      'up': True}}}
</pre>

After:
<pre>
{'brynhilde': {'eth0': {'hwaddr': '00:30:48:34:2a:ca', 'up': False},
               'eth1': {'hwaddr': '00:30:48:34:2a:cb',
                        'inet': [{'address': '10.7.161.4',
                                  'broadcast': '10.7.175.255',
                                  'label': 'eth1',
                                  'netmask': '255.255.240.0'}],
                        'inet6': [{'address': '2620:0:170:9900:230:48ff:fe34:2acb',
                                   'prefixlen': '64'},
                                  {'address': 'fe80::230:48ff:fe34:2acb',
                                   'prefixlen': '64'}],
                        'up': True},
               'eth2': {'hwaddr': '00:07:43:13:48:00', 'up': False},
               'eth3': {'hwaddr': '00:07:43:13:48:08', 'up': False},
               'eth4': {'hwaddr': '00:02:c9:32:06:30',
                        'inet': [{'address': '75.75.11.23',
                                  'broadcast': '75.75.11.255',
                                  'label': 'eth4',
                                  'netmask': '255.255.255.0'}],
                        'inet6': [{'address': 'fe80::202:c9ff:fe32:630',
                                   'prefixlen': '64'}],
                        'up': True},
               'lo': {'hwaddr': '00:00:00:00:00:00', 'up': True}}}
</pre>
 2012-11-05 09:03:22 -08:00
Thomas S Hatch
8578c69df4 Merge pull request #2450 from giantlock/develop 
Module for viewing and modifying sysctl parameters for FreeBSD
 2012-11-05 08:46:33 -08:00
Thomas S Hatch
7e3319cff5 minor spelling fix in doc string 2012-11-05 09:38:37 -07:00