Commit Graph

38041 Commits

Author SHA1 Message Date
Steve Weber
54b9aedbf7 ipython log to look for 2014-10-06 12:54:36 -04:00
Mike Place
eacd3746f2 Revert cmdmod from utils 2014-10-06 10:51:20 -06:00
Mike Place
c319461c60 Revert cmdmod refactor 2014-10-06 10:50:58 -06:00
Mike Place
4ecacb166b Revert cmdmod refactor 2014-10-06 10:46:12 -06:00
Thomas S Hatch
52d4fbad1f Merge pull request #16391 from juiceinc/2014.7
Cherry-pick masterless doc clarifications for 2014.7
2014-10-06 10:35:05 -06:00
Thomas S Hatch
8e35c6d0ff Merge pull request #16389 from JensRantil/fix-client-acl-doc
Fix incorrect client ACL documentation
2014-10-06 10:34:44 -06:00
Thomas S Hatch
78887113b2 Merge pull request #16388 from odin793/develop
fixed bug with outputting unicode text in state's result summary
2014-10-06 10:33:57 -06:00
Thomas S Hatch
1c7b437a4a Merge pull request #16387 from terminalmage/bp-16386
Backport #16386 to 2014.7
2014-10-06 10:32:28 -06:00
Thomas S Hatch
df0536d131 Merge pull request #16385 from Akilesh1597/develop
create new file if not already present
2014-10-06 10:31:00 -06:00
Thomas S Hatch
c364345560 Merge pull request #16375 from bechtoldt/debian_ip_whitespacing
fixing whitespacing bug in a debian_ip template
2014-10-06 10:26:03 -06:00
Thomas S Hatch
38da77976c Merge pull request #16368 from Supermathie/16366
documentation: add salt/ event prefix and explain how to get event tag while listening for events
2014-10-06 10:21:00 -06:00
Thomas S Hatch
2551ea2c56 Merge pull request #16359 from whiteinge/rest_cherrypy-expire-response
Add a setting to prevent CherryPy from expiring HTTP responses
2014-10-06 10:19:22 -06:00
Thomas S Hatch
74bc3b8796 Merge pull request #16095 from thedrow/feature/vpc
[WIP] AWS VPC module improvements
2014-10-06 10:12:07 -06:00
Mike Place
e0d5bbda57 Merge branch 'develop' into develop_housekeeping 2014-10-06 09:56:19 -06:00
Joseph Hall
47b8cb5359 Merge pull request #16390 from angystardust/develop
Fix inconsistency in linux_acl.py examples
2014-10-06 08:09:41 -06:00
Erik Johnson
188fd6c063 Merge pull request #16333 from terminalmage/update-spec
Update RPM spec for 2014.1.11
2014-10-05 17:10:32 -05:00
angystardust
7828d2085c Fix inconsistency in linux_acl.py examples 2014-10-05 16:58:11 +02:00
Jens Rantil
53153277ce Fix incorrect client ACL documentation
Tested this by setting up a local Vagrant instance using the following
procedure:
 1. Made a fresh minion/master install (using salt-bootstrap) of version
    2014.1.10.
 2. Adding a `test.ping` ACL rule for the `vagrant` user.
 3. Asserting that I couldn't execute `salt '*' test.ping'` as `vagrant`
    user.
 4. Applying `chmod 755 /var/cache/salt /var/cache/salt/master/jobs
    /var/run/salt /var/run/salt/master`.
 5. Verifying that `salt '*' test.ping'` now works.

Fixes #16318.
2014-10-05 10:40:37 +02:00
akilesh1597
b5412f905e Merge branch 'develop' of github.com:saltstack/salt into develop 2014-10-05 12:39:36 +05:30
akilesh1597
9ba37cfc8b fix ini_manage lint error 2014-10-05 12:38:34 +05:30
Stas Kotseruba
ebc5895b08 fixed bug with outputting unicode text in state's result summary 2014-10-05 12:43:41 +08:00
Erik Johnson
7efd690e33 Replace backslash-quote with raw string formatting 2014-10-04 20:47:39 -05:00
Georges Racinet
23bae10679 Issue #16384: avoid lspci warnings on OpenVZ containers
I did not dare to shuffle things around in the huge _virtual() method.
Instead, logging gets postponed, and upon detection of 'virtual:openvzve',
failures for lspci and dmidecode get discarded
2014-10-04 20:47:13 -05:00
Erik Johnson
683ef2e021 Replace backslash-quote with raw string formatting 2014-10-04 20:36:59 -05:00
Erik Johnson
5dad31448d Merge branch 'gracinet-develop' into develop 2014-10-04 20:35:47 -05:00
Erik Johnson
8002c372f9 Merge branch 'develop' of https://github.com/gracinet/salt into gracinet-develop 2014-10-04 20:35:10 -05:00
Tim O'Guin
156768408a updated masterless documentation to clarify the need to disable (or not run) the salt-minion daemon, otherwise the minion will attempt to connect to a master 2014-10-04 14:57:06 -05:00
Thomas S Hatch
9049d5733e Merge pull request #16362 from cro/20141003_mergefwd
Merge forward from 2014.7 was messy
2014-10-04 13:53:01 -06:00
akilesh1597
31096352ed create new file if not already present 2014-10-04 20:13:53 +05:30
Georges Racinet
6007d6b5ed Issue #16384: avoid lspci warnings on OpenVZ containers
I did not dare to shuffle things around in the huge _virtual() method.
Instead, logging gets postponed, and upon detection of 'virtual:openvzve',
failures for lspci and dmidecode get discarded
2014-10-04 16:38:37 +02:00
Joseph Hall
d7d4b4b82d Merge pull request #16369 from terminalmage/cli-example-formatting
Fix formatting of CLI examples in cloud exec module
2014-10-03 21:01:50 -06:00
Mike Place
6df16491e1 Fix lint errors 2014-10-03 20:36:12 -06:00
Samuel M Smith
3b3ec74c7a added application kind to RoadStack setup and then commented it out because errors 2014-10-03 18:03:23 -06:00
Samuel M Smith
1999f92173 Changed naming for estates and lane names to not be the same as the key role but to be derived from the role
based on the application kind
the raet role is the same as the minion id in salt

so  minion with id 'alpha' has a raet role of 'alpha'
the minion primary estate name is produced by appending '_' and the application kind
the application kinds are ['master', 'minion', 'syndic', 'call']
If the application kind is 'minion' then
Then the primary minion estate name is  'alpha_minion'
The lanename for the manor lane is also 'alpha_minion'

On a master the estate name is master role with the application kind appended
so if the master id = 'master' = raet role and the application kind is 'minion'
 then the primary estate name is
'master_master'

The lanename for the manor lane on a master is special
this is because salt cloud uses of the raet_channel do not yet have opts associated with them
so there is no way to extract the id or the application kind.
As a result the lanename for the master manor lane is always 'master'
This imposes a constraint that there only be one master on a given directory structure that
is the sock_dir must be unique per master else there will be collisions with the manor lane
of multiple master on the same host.

The estate name must be globally unique for a given raet Road
This convention allows multiple Estares to share the same role as long as they are
of unique application kinds.
The primary use case is to support salt_caller as an independent estate and not use the
minion primary estate to communicate with the master
2014-10-03 17:41:43 -06:00
Arnold Bechtoldt
eacad9a312 fixing whitespacing bug in debian_ip template 2014-10-04 01:14:42 +02:00
Mike Place
647256687c Docstrings. Formatting. 2014-10-03 16:39:04 -06:00
Mike Place
b1d96d0469 Docstring 2014-10-03 16:22:07 -06:00
Mike Place
a161ccbc65 Unusued var 2014-10-03 16:19:10 -06:00
Mike Place
e70914a2c7 Better variable naming 2014-10-03 16:15:43 -06:00
Mike Place
d1c2078930 Remove unused var 2014-10-03 16:14:12 -06:00
Mike Place
a71b563b59 Surpress pylint warning 2014-10-03 16:12:47 -06:00
Mike Place
a1fefe7a09 Better var naming 2014-10-03 16:10:54 -06:00
Mike Place
8fa533595b Capitalize constant. Silence pylint warnings. 2014-10-03 16:08:50 -06:00
Mike Place
e2d6b8398e Lint manage runner 2014-10-03 16:05:52 -06:00
Mike Place
fbb9c872dc Docstrings 2014-10-03 15:57:46 -06:00
Mike Place
ce358d0f52 Remove unused code 2014-10-03 15:54:18 -06:00
Mike Place
406f335e46 Clean up var naming 2014-10-03 15:45:02 -06:00
Mike Place
8dfaec339b Lint spacing and proper constant capitalization 2014-10-03 15:42:53 -06:00
Mike Place
40aaf6623b Clear up duplicate func/arg names 2014-10-03 15:37:13 -06:00
Mike Place
02406843e5 More pythonic variable names and docstrings 2014-10-03 15:28:40 -06:00