Commit Graph

26065 Commits

Author SHA1 Message Date
Tomas Kral
7c4c543fdd doc: fix references in salt.modules.pkg 2014-02-17 13:54:42 +01:00
Pedro Algarvio
2cd772cf59 Merge pull request #10491 from gtmanfred/glusterfs
Clean up lint changes
2014-02-16 18:12:33 +00:00
Daniel Wallace
0aa968ba62 Clean up lint changes
act_peer wasn't included enough.  Also cleared out **kwargs.
2014-02-16 11:59:06 -06:00
Joseph Hall
0332be8b48 Merge pull request #10489 from s0undt3ch/develop
Lint fixes
2014-02-16 10:03:13 -07:00
Pedro Algarvio
ab2506cb50 Remove un-used import. 2014-02-16 17:00:02 +00:00
Pedro Algarvio
43bdc4caf9 Remove unused import. Don't shaddow peer(). 2014-02-16 16:59:05 +00:00
Joseph Hall
8a3d0fa8f6 Merge pull request #10488 from s0undt3ch/develop
Unify the minimal libcloud version requirement.
2014-02-16 09:40:37 -07:00
Pedro Algarvio
67778949e0 The minimal requirement for apache-libcloud is now 0.14.0. 2014-02-16 16:38:02 +00:00
Pedro Algarvio
17c3d20974 Unify the minimal libcloud version requirement. 2014-02-16 16:32:19 +00:00
Joseph Hall
6692c242a9 Merge pull request #10486 from gtmanfred/glusterfs
Add glusterfs state and module
2014-02-16 09:26:08 -07:00
Daniel Wallace
0ac447f1e0 Clean up glusterfs module and state
Cleaning up a few small things.
2014-02-16 09:30:22 -06:00
Joseph Hall
7d6fcf8ff5 Merge pull request #10487 from obestwalter/develop
use the value of __virtualname__ instead of a string
2014-02-16 06:32:16 -07:00
Oliver Bestwalter
5d52a00f80 use the value of __virtual__ instead of a string 2014-02-16 14:02:02 +01:00
Pedro Algarvio
b046a6f4b1 Merge pull request #10483 from gtmanfred/fixlocal
[salt.cloud] master_minion_name referenced before assignment
2014-02-16 12:47:59 +00:00
Daniel Wallace
f73cba3e0b Fix lint errors for gluster modules 2014-02-16 06:07:52 -06:00
Daniel Wallace
a76f4343dd Make peers plural for glusterfs 2014-02-16 04:05:50 -06:00
Daniel Wallace
e510c287c2 Add peered status 2014-02-16 02:57:10 -06:00
Daniel Wallace
5308fd9119 Add gluster cluster state 2014-02-16 02:22:52 -06:00
Daniel Wallace
0085232d1d [salt.cloud] master_minion_name referenced before assignment
Fixes error caused by 42ca06c9

[ERROR   ] There was a query error: local variable 'master_minion_name' referenced before assignment
Traceback (most recent call last):
  File "/usr/lib/python2.7/site-packages/salt/cloud/cli.py", line 389, in run
    ret = mapper.run_map(dmap)
  File "/usr/lib/python2.7/site-packages/salt/cloud/__init__.py", line 1611, in run_map
    if name in (master_name, master_minion_name):
UnboundLocalError: local variable 'master_minion_name' referenced before assignment
2014-02-16 01:27:08 -06:00
Daniel Wallace
1d08acb98b Add start method to glusterfs module 2014-02-16 01:07:09 -06:00
Daniel Wallace
927af32d3e Add initial glusterfs module 2014-02-16 00:51:06 -06:00
Joseph Hall
519ceec54c Merge pull request #10465 from gtmanfred/filesystems
Allow formatting of partitions
2014-02-15 19:46:21 -07:00
Daniel Wallace
c32e34fc31 Allow formatting partitions
Be able to have a partition as a specific filesystem state.  Only
included inode_size because that is the one I need right now.  We can
add more later.
2014-02-15 18:46:44 -06:00
David Boucha
c9ebb2dcf9 Merge pull request #10476 from s0undt3ch/hotfix/jinja-sequence-filter
Jinja's sequence filter does not need to be an extension.
2014-02-15 11:22:28 -07:00
Pedro Algarvio
7a42bf24fc Jinja's sequence filter does not need to be an extension. 2014-02-15 17:26:35 +00:00
Joseph Hall
da6f73fbb2 Merge pull request #10474 from s0undt3ch/hotfix/lint
PyLint quietly ignore it!
2014-02-15 09:37:13 -07:00
Pedro Algarvio
197966ca58 Tell PyLint not to complain about ignored files 2014-02-15 16:30:42 +00:00
Pedro Algarvio
a009d6b80a Make Pylint ignore file 2014-02-15 16:30:23 +00:00
Joseph Hall
50f3df8114 Merge pull request #10460 from s0undt3ch/hotfix/make-master-local-minion
Allow the new master's minion to answer to local master
2014-02-15 07:22:26 -07:00
Pedro Algarvio
4f6a3e36af Remove first person reference 2014-02-15 14:17:21 +00:00
Pedro Algarvio
3436863f41 Add exmaple of any minion responding to local master 2014-02-15 14:17:21 +00:00
Pedro Algarvio
c27bb8b4a0 Remove extra space 2014-02-15 14:17:21 +00:00
Pedro Algarvio
2db72c519b Allow any of the minions to say they're local 2014-02-15 14:17:21 +00:00
Pedro Algarvio
5d77e5244d Document make master's minion answer to local master. 2014-02-15 14:17:21 +00:00
Pedro Algarvio
42ca06c90a Allow the new master's minion to answer to local master 2014-02-15 14:17:21 +00:00
Joseph Hall
c8729d8870 Merge pull request #10472 from obestwalter/develop
fixed typos: recieved -> received
2014-02-15 06:30:34 -07:00
Oliver Bestwalter
72d4f55270 fixed typos: recieved -> received 2014-02-15 12:50:20 +01:00
Thomas S Hatch
14e79ea857 Merge pull request #10379 from johnnoone/jinja-filter
fix jinja SequenceExtension
2014-02-14 22:39:30 -07:00
Joseph Hall
20b9511a76 Merge pull request #10464 from hulu/remove_mentions_of_0_18_0
Replace mentions of 0.18.0 with 2014.1.0
2014-02-14 19:36:38 -07:00
David Lindquist
9c91539de7 Replace mentions of 0.18.0 with 2014.1.0 2014-02-14 17:01:57 -08:00
Pedro Algarvio
56af316318 Merge pull request #10462 from rallytime/lint_fixes
Missed one lint fix - fixed now
2014-02-15 00:42:58 +00:00
rallytime
1a5838826c Missed one lint fix 2014-02-14 17:17:39 -07:00
David Boucha
a09e97e51d Merge pull request #10461 from UtahDave/develop
add newer 0.17.5 Windows installer links
2014-02-14 16:53:30 -07:00
David Boucha
4ec8959149 add newer 0.17.5 Windows installer links 2014-02-14 16:51:05 -07:00
Thomas S Hatch
da477a920b Merge pull request #10457 from basepi/configfix10433
Clarify the actions salt will take when run as non-root, Ref #10433
2014-02-14 16:35:15 -07:00
Thomas S Hatch
1a1abd978d Merge pull request #10458 from basepi/tokenperms10422
Ensure ~/.salt_token is created with 0600 permissions, Fix #10422
2014-02-14 16:34:37 -07:00
Thomas S Hatch
67205e2106 whitespace 2014-02-14 16:34:03 -07:00
Colton Myers
f0f96acab1 Ensure ~/.salt_token is created with 0600 permissions, Fix #10422 2014-02-14 15:10:34 -07:00
Thomas S Hatch
2b745e2b9b Merge pull request #10442 from SaveTheRbtz/security
security: avoid race between file creation and chmod(2)
2014-02-14 15:02:05 -07:00
Alexey Ivanov
cf0f1c981c security: avoid race between file creation and chmod(2)
Also:
- salt.utils.check_ipc_path_max_len() on master pull socket
- change mode from 0700 to 0600 for socket files
- added debug logging

TODO: move file creation with specified mode to separate utils function.
2014-02-14 13:57:33 -08:00