Commit Graph

55829 Commits

Author SHA1 Message Date
Antoine Jacoutot
4c35e8182f OpenBSD salt package: update list of dependencies. 2015-10-19 19:01:26 +02:00
Thomas S Hatch
ba4877d71a Merge pull request #25442 from ajacoutot/rcctl
openbsd-rcctl: use new syntax to speed up listing services
2015-07-15 13:40:53 -06:00
Antoine Jacoutot
f2a6ca6a50 Please lint. 2015-07-15 19:04:56 +02:00
Mike Place
0379805e9d Merge pull request #25400 from dmuntean/allow-generators-in-cloud-config-value
Allow usage of generators in Salt cloud config values
2015-07-15 08:59:19 -06:00
Mike Place
48b1b42559 Merge pull request #25429 from wido/cloudstack-smbios
Detect Apache CloudStack KVM Hypervisor in core grain
2015-07-15 08:42:02 -06:00
Mike Place
a5551a0569 Merge pull request #25450 from bbinet/pillarstack-update
integrate pillarstack upstream fixes
2015-07-15 08:35:01 -06:00
Bruno Binet
bc39b97419 Fix "IndexError: list index out of range"
When running Python 2.7, an empty list will throw an "IndexError: list index out of range" error. We must check if the list is not empty before trying to iterate over it.

(backport 91319cb4e1)
2015-07-15 15:28:18 +02:00
Bruno Binet
05d03bbc10 check parsed yaml is a valid dict before trying to merge
(backport 0e82eb9cda)
2015-07-15 15:27:20 +02:00
Antoine Jacoutot
487c05f9e6 openbsd-rcctl: use new syntax to speed up listing services
I just introduced a new subcommand to rcctl(8) in OpenBSD that allows
querying for services (all, enabled, disabled, ...) so make salt use it.
2015-07-15 05:07:58 +02:00
Wido den Hollander
9c3d31cdfa Detect Apache CloudStack KVM Hypervisor in core grain
In the next Apache CloudStack release the KVM Hypervisor will provide
additional information via smbios to the guest.

This allows SaltStack to detect that the machine is running inside
KVM on Apache CloudStack.
2015-07-15 00:21:05 +02:00
Mike Place
f9b8567c06 Merge pull request #25425 from sbraverman/docs-external_pillar
Updates documentation for external_pillar - Fixes Bash example
2015-07-14 15:27:49 -06:00
Mike Place
e38cb9d5e4 Merge pull request #25424 from brbrady/retcode_doc_fix
[docs] return will not work in the context it is being used in
2015-07-14 15:26:39 -06:00
Steven Braverman
8416299cc1 Updates documentation for external_pillar - Fixes Bash Example 2015-07-14 14:26:00 -07:00
Ben Brady
a6bbfbfe8e return will not work in the context it is being used in - docs are misleading 2015-07-14 14:13:03 -07:00
Colton Myers
849f792ca6 Merge pull request #25414 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
2015-07-14 12:01:09 -06:00
Colton Myers
8e8cdf2cc3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-14 11:08:25 -06:00
Mike Place
a37ac73521 Merge pull request #25410 from cachedout/fix_slack_tests
Correct broken slack tests
2015-07-14 10:44:05 -06:00
Mike Place
aa8837108a Correct broken slack tests 2015-07-14 10:35:06 -06:00
Mike Place
e4b693eb8c Merge pull request #25404 from DSRCompany/failover_dns_fix
Fixed minion failover to next master on DNS errors.
2015-07-14 10:17:19 -06:00
Mike Place
bd7c71e3e4 Merge pull request #25407 from rallytime/bp-23236
Back-port #23236 to 2015.8
2015-07-14 10:09:21 -06:00
Mike Place
334eafa0ef Merge pull request #25409 from rallytime/bp-24422
Back-port #24422 to 2015.8
2015-07-14 10:08:49 -06:00
rallytime
a0130f5499 Update Beryllium refs to 2015.8.0 2015-07-14 09:11:57 -06:00
Arnold Bechtoldt
6fc871470b remove log entry that was used for debugging only 2015-07-14 09:06:55 -06:00
Arnold Bechtoldt
a12e287e2c improve profile mgmt 2015-07-14 09:06:48 -06:00
Arnold Bechtoldt
8de1d239e9 raise exception in modules.elasticsearch when connection to ES cluster failed 2015-07-14 09:06:41 -06:00
Arnold Bechtoldt
2676d8405c refactor elasticsearch integration
* salt.modules.elasticsearch
* salt.states.elasticsearch*
* salt.returners.elasticsearch
2015-07-14 09:06:13 -06:00
Arnold Bechtoldt
7bb074cf96 remove log entry that was used for debugging only 2015-07-14 09:02:33 -06:00
Arnold Bechtoldt
a4d1d24926 improve profile mgmt 2015-07-14 09:01:43 -06:00
Arnold Bechtoldt
fd564b87da raise exception in modules.elasticsearch when connection to ES cluster failed 2015-07-14 09:01:35 -06:00
Arnold Bechtoldt
3e2edd33d4 refactor elasticsearch integration
* salt.modules.elasticsearch
* salt.states.elasticsearch*
* salt.returners.elasticsearch
2015-07-14 09:00:26 -06:00
Nicole Thomas
cd3abcd5ae Merge pull request #25399 from jarpy/client-acl-per-minion-doc
Demonstrate per-minion client_acl.
2015-07-14 08:53:41 -06:00
Mike Place
8faa49a226 IPC transport skeleton
Basic IPC server works!

Lint

Skeleton of client

IPC bind test

Make stand-alone

Adding factories for push and pull channels

Allowing opts passing for consistency

Tests now (mostly) work

Lint

Method documentation

General cleanup. Migrate to inheritence.

Log cleanup

Migrate framing to stand-along module

Migrate ipc.py to new framer

Working except for serialization bug

Debugging

Debugging

It works!!

Remove ZeroMQ from TCP transport :]

General cleanup

Linting

General cleanup

Align socket name with what client expects

Remove unused buffer size flag

exception handling for stream close

Calls to parent class inits

Docs

Remove debugging

Remove unused function

Remove unnecessary pre/post fork on msgclient

Remove unecessary timeout flag

Better stream/socket shutdown in server

Remove unused handler

Removing more unused

More function cleanup

Removing more unneeded cruft

Lint

Round out documentation

More docs

Misc hacks to fix up @cachedout's IPC

This was using a mix of blocking and non-blocking calls, which was making a bit of a mess. connect and write are both non-blocking calls on IOStreams, so we either need to handle all the callbacks or do them in the coroutine fashion (much easier to manage). This meant that in the tests your "write" wouldn't make it out since we didn't wait on the connect.

IMO we should refactor this IPC stuff to have proper async interfaces and wrap if absolutely necessary, but I think its reasonable to ask that as part of this we make some more of the core coroutines :)

for #23236

Lint

Remove init of io_loop because we require start()

Various fixes

Remove uneeded functionality

Remove dup

Cleanup and remove unused functions

Moving toward coroutines

More lint

handle_connection changed to spawn

Singletons for ipcclient

Lint disable

Remove redundent check in close()

Remove duplicates in init

Improved exception handling

Test framework

Require sock path to be passed in

Better testing approach

Remove unecessary __init__

Misc cleanup of unecessary methods

Major rework of the IPC channels to make them work :)

Remove TODO, since the feature was implemented

Add more tests for IPC

Add support for reconnecting clients, as well as a return from the IPCServer

misc cleanup

Lint test case

Lint transport
2015-07-14 08:47:09 -06:00
Dmitry Kuzmenko
80473dca04 Fixed minion failover to next master on DNS errors. 2015-07-14 14:44:17 +03:00
Dmitri Muntean
6785eb2bef Make this change python3 compatible, also provide default if generator is exhausted 2015-07-14 15:03:55 +10:00
Dmitri Muntean
44a3812bff Allow usage of generators in Salt cloud config values
This makes code much more readable if one needs to create multiple VMs
with different parameters.

Instead of calling multiple times client.create() with different values,
a single call can be used with generators as values.

client.create() takes "names" parameter as a list, to spin up multiple
instances, this will allow usage of different values for other parameters
2015-07-14 14:28:07 +10:00
Jarpy
ec10c39297 Typo in client_acl ref doc. 2015-07-14 13:40:01 +10:00
Justin Findlay
17daf76c0f Merge pull request #25394 from rallytime/bp-25355
Back-port #25355 to 2015.8
2015-07-13 21:26:26 -06:00
Justin Findlay
2b5c2b3b05 Merge pull request #25393 from rallytime/bp-25289
Back-port #25289 to 2015.8
2015-07-13 21:25:34 -06:00
Jarpy
cd0b527939 Demonstrate per-minion client_acl.
The client_acl system supports setting restrictions based on minion name.
Update the Client ACL System reference page to reflect this.
2015-07-14 13:03:00 +10:00
Mike Place
727e322188 Merge pull request #23236 from cachedout/ipc
Remove ZeroMQ dependency from master publisher
2015-07-13 17:42:43 -06:00
Mike Place
abc0b8ea0e Merge pull request #25388 from garethgreenaway/move_to_salt_utils_slack
Move to salt.utils.slack
2015-07-13 16:37:47 -06:00
Gareth J. Greenaway
5231a2b521 Fixing empty line at the end of salt.utils.slack. 2015-07-13 15:29:25 -07:00
Mike Place
1d905acb1f Merge pull request #25389 from l2ol33rt/gpg_note
Adding entropy note for gpg renderer
2015-07-13 16:28:29 -06:00
Kaido Kert
9f1d4ab9b0 EC2 cloud: Fix another availability zone mismatch, preventing cloud.profile state from working correctly 2015-07-13 16:24:06 -06:00
Chris Reeves
49becde5ea Fixing lint error 2015-07-13 16:22:23 -06:00
Chris Reeves
68fef7a976 Comment spelling corrections - thx @jackqu7 2015-07-13 16:22:23 -06:00
Chris Reeves
ffddb940b9 Allow auth basic subscriptions to be checked against existing
subscriptions
2015-07-13 16:22:23 -06:00
Mike Place
e592897604 Merge pull request #25391 from cachedout/fix_24985_test
Fix tests for #24985
2015-07-13 16:19:49 -06:00
Mike Place
9cc897fd69 Fix tests for #24985 2015-07-13 16:19:21 -06:00
Mike Place
0ed289e3f4 Merge pull request #24985 from cingeyedog/develop
Check to see if IPTables rule exists before appending or inserting.  RHEL6 Family of servers
2015-07-13 16:18:29 -06:00