vs
f3aa94699d
add filesystem-cache options
2014-08-25 07:59:43 +02:00
Erik Johnson
b65c04f533
Merge pull request #15214 from techhat/cpan
...
Initial commit of CPAN execution module
2014-08-24 10:48:27 -05:00
Joseph Hall
40b1a38fe2
Merge pull request #15222 from toddnni/doc-module-state-kwargs-example
...
Add an example of keyword argument passing to module state
2014-08-24 06:03:22 -06:00
Toni Ylenius
67e8db0c26
An example of keuword argument passing in module.run
2014-08-24 10:36:37 +03:00
Pedro Algarvio
c353a85ff6
Merge pull request #15216 from techhat/iptables
...
Add note concerning iptables --check workaround
2014-08-24 01:51:40 +01:00
Joseph Hall
04b64013d7
Linting
2014-08-23 18:46:12 -06:00
Joseph Hall
16e17096a9
Add note concerning iptables --check workaround
2014-08-23 18:45:51 -06:00
Joseph Hall
0f595a231c
Merge pull request #15204 from dmyerscough/fix-duplicate-iptables
...
Stop duplicate rules
2014-08-23 18:34:54 -06:00
Erik Johnson
33c1693cae
Merge pull request #15206 from toddnni/pw-user-list-users
...
Add list_users() to pw_user (FreeBSD)
2014-08-23 17:39:47 -05:00
Joseph Hall
3958d3d95b
Linting
2014-08-23 15:59:56 -06:00
Joseph Hall
b5ab64ad1a
Oops, forgot to finish a docstring
2014-08-23 15:17:46 -06:00
Joseph Hall
c7c123b67d
Initial commit of CPAN execution module
2014-08-23 15:12:04 -06:00
Damian Myerscough
4f4c229045
using splitlines method instead of split
2014-08-23 10:23:54 -07:00
Joseph Hall
ff64c030bf
Merge pull request #15205 from dmyerscough/14880-fix-list-nodes
...
Fixing #14880 vsphere node list
2014-08-23 06:49:53 -06:00
Toni Ylenius
aa00ef9ff0
Add list_users() to pw_user (FreeBSD)
...
Synced list_users() from useradd.py to pw_user.py.
2014-08-23 12:39:19 +03:00
Damian Myerscough
7a3ea9834e
Fixing #14880 listing nodes
2014-08-22 23:59:55 -07:00
Damian Myerscough
4a56bf662c
Fixing #14880 listing nodes
2014-08-22 23:58:19 -07:00
Damian Myerscough
4f21a280e6
Fix IPtables for adding duplicated iptables
2014-08-22 21:32:09 -07:00
Thomas S Hatch
317ec24ccc
Merge pull request #15176 from jgillich/patch-1
...
remove example duplicate
2014-08-22 14:15:46 -06:00
Thomas S Hatch
8d408defc6
Merge pull request #15165 from gtmanfred/develop
...
[salt.cloud] [Do not merge] automatically load novaclient extensions pt.2.
2014-08-22 14:14:25 -06:00
Thomas S Hatch
0c05702184
Merge pull request #15193 from techhat/clouddocs
...
Cloud cache is now msgpack, not json
2014-08-22 14:11:08 -06:00
Joseph Hall
3571d3eb3c
Cloud cache is now msgpack, not json
2014-08-22 13:22:25 -06:00
Joseph Hall
1db825be19
Merge pull request #15191 from hulu/sodium-spacing
...
sodium_grabber_installer: fix kwarg spacing
2014-08-22 13:20:00 -06:00
Chris Rebert
fcc41721fd
sodium_grabber_installer: fix kwarg spacing
...
************* Module sodium_grabber_installer
pkg/smartos/esky/sodium_grabber_installer.py:16: [C0326(bad-whitespace), ] No space allowed around keyword argument assignment
sources = [path.join(HERE, 'sodium_grabber.c')],
^
pkg/smartos/esky/sodium_grabber_installer.py:17: [C0326(bad-whitespace), ] No space allowed around keyword argument assignment
libraries = ['sodium'],
^
2014-08-22 12:04:34 -07:00
Joseph Hall
dbbecefa99
Merge pull request #15190 from hulu/random-copyediting
...
copyedits
2014-08-22 13:02:55 -06:00
Chris Rebert
a53ae15d23
copyedits
2014-08-22 11:59:13 -07:00
Thomas S Hatch
224acd25df
Merge pull request #15174 from steverweber/slspath_fix
...
change var slspathdot to slsdotpath
2014-08-22 12:30:17 -06:00
Thomas S Hatch
0817e60494
Merge pull request #15168 from lyft/14752-boto_get_group-ignores-region
...
Resove issue with ignored region argument
2014-08-22 12:26:44 -06:00
Thomas S Hatch
26f6acc1d0
Merge pull request #15163 from garethgreenaway/apply_hostname
...
Changes to modules debian_ip and rh_ip, and the network.py state
2014-08-22 12:13:18 -06:00
Thomas S Hatch
1ae169b9e0
Merge pull request #15188 from thatch45/develop
...
Cleaning
2014-08-22 11:39:15 -06:00
Thomas S Hatch
b9a55579ce
Merge branch 'develop' of github.com:saltstack/salt into develop
...
Conflicts:
salt/cloud/__init__.py
2014-08-22 11:38:38 -06:00
Thomas S Hatch
fc179f2f6f
Merge pull request #15179 from cingeyedog/develop
...
Changing default hash in file.py
2014-08-22 11:18:41 -06:00
Pedro Algarvio
92cd6ece62
Merge pull request #15181 from techhat/cloudrender
...
Send cloud maps through salt renderer system
2014-08-22 18:08:19 +01:00
Joseph Hall
97575e0366
Linting
2014-08-22 10:32:42 -06:00
Joseph Hall
b8123b2497
Send cloud maps through salt renderer system
2014-08-22 09:58:00 -06:00
cingeyedog
e1e902bacc
Changing default hash in file.py
...
Changed default hashtype in file.py to sha256. This was not reading
the hash_type from the minion config. FIPS doesnt allow md5 as a valid
hash type.
ID: /etc/snmp/snmpd.conf
Function: file.managed
Result: False
Comment: An exception occurred in this state: Traceback (most
recent call last):
File "/usr/lib/python2.6/site-packages/salt/state.py",
line 1379, in call
**cdata['kwargs'])
File
"/usr/lib/python2.6/site-packages/salt/states/file.py", line 1246, in
managed
**kwargs
File
"/usr/lib/python2.6/site-packages/salt/modules/file.py", line 2363, in
check_managed
**kwargs)
File
"/usr/lib/python2.6/site-packages/salt/modules/file.py", line 2106, in
get_managed
hsum = get_hash(sfn)
File
"/usr/lib/python2.6/site-packages/salt/modules/file.py", line 424, in
get_hash
return salt.utils.get_hash(path, form, chunk_size)
File
"/usr/lib/python2.6/site-packages/salt/utils/__init__.py", line 1468,
in get_hash
hash_obj = hash_type()
ValueError: error:060800A3:digital envelope
routines:EVP_DigestInit_ex:disabled for fips
2014-08-22 11:17:53 -04:00
Jakob Gillich
0112f70d9c
remove example duplicate
2014-08-22 16:06:09 +02:00
Steve Weber
d4c5cc7056
change var slspathdot to slsdotpath
2014-08-22 09:53:58 -04:00
Colin Johnson
8192720f21
Resove issue with ignored region argument https://github.com/saltstack/salt/issues/14752
2014-08-22 06:09:18 +00:00
Thomas S Hatch
61d9f69d0e
How long has that been in there?
2014-08-21 21:16:33 -06:00
Thomas S Hatch
4b785ea32b
Merge branch '2014.7' into develop
2014-08-21 18:42:28 -06:00
Thomas S Hatch
c887a04a85
Merge pull request #15164 from thatch45/raet_route_fix
...
Fix raet resolver routines
2014-08-21 18:41:05 -06:00
Thomas S Hatch
9ef26f8af1
Merge pull request #1 from whiteinge/raet-auth-router
...
Changed a few router defaults
2014-08-21 18:40:52 -06:00
Seth House
5b8f2a471a
Changed a few router defaults
2014-08-21 18:38:11 -06:00
Daniel Wallace
1b96e9f17c
dammit
2014-08-21 19:37:07 -05:00
Daniel Wallace
6e27715028
only load functions and hooks once
...
novaclient doesn't check if it has already loaded extensions, so we only
want to run this ones, the first time that it is loading, since we
are manually overwriting the classes in memory anyway.
2014-08-21 18:58:05 -05:00
Daniel Wallace
38d8e074eb
clean up kwargs
2014-08-21 18:57:47 -05:00
Daniel Wallace
ecb89fd34e
pylint fix
2014-08-21 18:57:39 -05:00
Daniel Wallace
241b00d5c1
kwargs should be vm_
...
this allows for specifying stuff to configure novaclient plugins, in the
cloud.profiles, such as public: False service_net: True
2014-08-21 18:57:23 -05:00
Daniel Wallace
88e8abc1d2
automatically use novaclient plugins
...
no more having to specify what module the extension should overwrite
2014-08-21 18:57:08 -05:00