valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,743 Commits 24 Branches 182 Tags 341 MiB
662d8d64a8
Commit Graph

76743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
662d8d64a8 Merge pull request #38166 from rallytime/cloud-deprecations 
Remove support for "provider" in cloud provider configs
 2016-12-20 08:06:19 -07:00
Mike Place
df462cbe3e Merge pull request #38212 from disaster123/develop_zmq_backlog 
ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog)
 2016-12-20 07:41:42 -07:00
Mike Place
2416304c88 Merge pull request #38296 from nevins-b/issue-38239 
Issue 38239
 2016-12-20 07:08:03 -07:00
Mike Place
9cd7b72442 Merge pull request #38359 from rallytime/remove-PidfileMixin 
Remove PidfileMixin as it is deprecated for removal in Nitrogen
 2016-12-20 06:48:20 -07:00
Mike Place
9350808fea Merge pull request #38361 from rallytime/deprecate-client_acl-client_acl_blacklist 
Remove support for client_acl and client_acl_blacklist
 2016-12-20 06:33:23 -07:00
Mike Place
5d497451cd Merge pull request #38362 from kai4785/feature/add-redhat-nm-controlled 
Add NM_CONTROLLED to redhat configured interfaces
 2016-12-20 06:31:10 -07:00
Mike Place
af286c1e89 Merge pull request #38363 from kai4785/feature/allow-openvswitch-internal-ports 
Allow the creation of an internal interface for an openvswitch port
 2016-12-20 06:30:23 -07:00
Mike Place
2ed09a502a Merge pull request #38369 from hvnsweeting/fix-influxdb-command 
Fix wrong function names
 2016-12-20 06:29:05 -07:00
Viet Hung Nguyen
8d795c4472 Fix wrong function names 2016-12-20 19:06:32 +07:00
rallytime
7357e6ae11 Remove unused import 2016-12-19 17:15:58 -07:00
Nicole Thomas
a8e2b026bc Merge pull request #38356 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-12-19 17:11:19 -07:00
Kai Meyer
43b2bec26f Allow the creation of an internal interface for an openvswitch port 
Openvswitch can create a virtual nic instead of only allowing existing
interfaces to be added. Once this virtual nic is created, it can be
managed by network.manage.

This patch allows me to configure a gre-tunnel private virtual network
for all my VMs, and then insert my host machine into that network.

br0:
  openvswitch_bridge.present

port0:
  openvswitch_port.present:
    - bridge: br0
    - type: vlan
    - id: 100
    - internal: true
  network.managed:
    - enabled: true
    - type: eth
    - ipaddr: 192.168.55.1
    - netmask: 255.255.255.0
 2016-12-19 16:51:29 -07:00
Kai Meyer
5c51c328e5 Add NM_CONTROLLED to redhat configured interfaces 
Some network interfaces (like openvswitch ports) are not backed by
physical devices, and NetworkManager barfs:

Error: Connection activation failed: No suitable device found for this
connection.

Preventing NetworkManager control to such a device will pass the control
to the other configuration tools, which operate 'ip' commands directly,
which do not suffer from this limitation.
 2016-12-19 16:51:00 -07:00
rallytime
a9f85f0dbe Remove support for client_acl and client_acl_blacklist 
These have been deprecated for some time and were marked for
removal in Nitrogen.

publisher_acl and publisher_acl_blacklist should be used instead.
 2016-12-19 16:18:48 -07:00
Nicole Thomas
48565fe2a8 Add missing CLI examples to grafana4 module (#38357) 2016-12-19 15:52:58 -07:00
rallytime
baf8f208eb Remove dup LXC doc reference 2016-12-19 15:49:37 -07:00
rallytime
279cec88da Remove PidfileMixin as it is deprecated for removal in Nitrogen 2016-12-19 15:32:22 -07:00
Nicole Thomas
a87fa91c7b Use correct import of salt.utils.event (not just "salt") (#38350) 
And add a versionadded tag to the new engine
 2016-12-19 14:15:43 -07:00
rallytime
8f80916432 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/topics/cloud/index.rst
  - salt/states/cron.py
 2016-12-19 14:00:52 -07:00
Stefan Priebe
15196c80be ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog) 2016-12-19 19:30:47 +01:00
Nevins Bartolomeo
7355e68928 allowing states from other saltenvs to be includes in top.sls 2016-12-19 12:26:03 -05:00
Mike Place
146fba2d53 Merge pull request #38117 from Whoops/develop 
redirect output when daemonizing and close std* first
 2016-12-19 07:41:03 -07:00
Mike Place
4d072ca689 Merge pull request #38106 from techhat/stateget 
"test" is not necessarily in opts, for thorium
 2016-12-19 07:40:31 -07:00
Mike Place
bb2ed5c48c Merge pull request #38140 from xbglowx/fix-dockerng-log-config 
Remove unneeded 'AND' portion of 'if' compound statement for log_config
 2016-12-19 07:38:38 -07:00
Mike Place
86c53b8efd Merge pull request #38172 from rallytime/win-deprecations 
Remove support for deprecation options/functions in win* files
 2016-12-19 07:33:05 -07:00
Mike Place
2cb5832b28 Merge pull request #38283 from sash-kan/patch-1 
call sdecode for the filename in file.managed()
 2016-12-19 07:24:49 -07:00
Mike Place
3fdcfb498d Merge pull request #38335 from mlalpho/states-saltmod-wait_for_event-data-dictionary-fix 
states saltmod wait_for_event data dictionary fix
 2016-12-19 07:22:44 -07:00
Mike Place
4c6a988c1f Merge pull request #38317 from mlalpho/boto_rds-backwards-compatibility-issues-and-various-bug-fixes 
boto_rds: backwards compatibility issues and various bug fixes
 2016-12-19 07:21:35 -07:00
Mike Place
22cd5257a1 Merge pull request #38343 from cachedout/pr-38270 
Junos engine (w/lint fix)
 2016-12-19 07:13:55 -07:00
Mike Place
940fd6634d
Lint errors 2016-12-19 07:11:25 -07:00
Mike Place
9747b48161 Merge pull request #38300 from cloudflare/FILE-RW 
File read fun
 2016-12-19 06:41:55 -07:00
Mike Place
8457db5bbc Merge pull request #38307 from HenriWahl/HenriWahl-patch-1 
If no IPv4 can be found use IPv6 for salt-cloud deployment
 2016-12-19 06:41:20 -07:00
Mike Place
a01fade604 Merge pull request #38333 from amendlik/states-alternatives 
Suppress errors when checking if an alternative exists
 2016-12-19 06:40:48 -07:00
Mike Place
15d3b476e9 Merge pull request #38340 from ewapptus/bp-38251 
Backport PR #38251: Fixed nested orchestrate not respecting failures
 2016-12-19 06:31:14 -07:00
Elias Wulcan
266e0a465c Fixed nested orchestrate not respecting failures 
Client was only setting success to false if the function called raised
an exception. This commit changes it to verify the content of return
value with check_state_result
 2016-12-19 10:29:05 +01:00
Henri Wahl
5937bbe729 Added excecpt KeyError 2016-12-19 07:53:22 +01:00
rajvidhimar
a36301014c Lint and other changes 2016-12-19 10:13:34 +05:30
Mircea Ulinic
a563937326
Use alt.utils.fopen instead of native open 2016-12-19 02:24:57 +00:00
Adam Mendlik
8bfcd5bcd5 Adjust alternatives test for updated error message 2016-12-18 10:04:24 -07:00
Mike Place
ecd441d090 Merge pull request #38229 from mcalmer/dockerng-sls_build-kwargs 
provide kwargs of sls_build to dockerng.create
 2016-12-18 06:13:09 -07:00
Mike Place
ea3dc75be8 Merge pull request #38267 from bbinet/grafana4 
Grafana4 salt module and states
 2016-12-18 06:09:34 -07:00
Mike Place
a00c0fb890 Merge pull request #38289 from skizunov/develop2 
Add config options for running beacons/scheduler before connect
 2016-12-18 06:06:17 -07:00
Mike Place
39eed71eca Merge pull request #38295 from porunov/develop 
Add path style requests and http protocol support to the s3 module
 2016-12-18 05:57:37 -07:00
Mike Place
ac5917da1d Merge pull request #38316 from mlalpho/fix-encoding-fix 
salt utils aws encoding fix
 2016-12-18 05:49:47 -07:00
Mike Place
d2ce9c3e71 Merge pull request #38309 from ewapptus/bp-37333 
Backport PR #37333: Fixed state.salt.runner() reporting success on exceptions
 2016-12-18 05:39:52 -07:00
Mike Place
ed80926975 Merge pull request #38319 from n-pochet/add-mattermost-feature 
Add Mattermost feature
 2016-12-18 05:36:54 -07:00
Mike Place
ebb9f6cbbc Merge pull request #38323 from rallytime/update-cloud-provider-links 
Update the Cloud Provider Specifics links in cloud docs
 2016-12-18 05:30:48 -07:00
Mike Place
5bd7471e30 Merge pull request #38324 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-18 05:30:25 -07:00
Mike Place
83523d2f73 Merge pull request #38325 from rallytime/bp-38247 
Back-port #38247 to 2016.11
 2016-12-18 05:28:40 -07:00
Mike Place
54a2bb95de Merge pull request #38326 from yopito/fix-runit-init-support 
fix runit init support (grain init) in 2016.11
 2016-12-18 05:07:24 -07:00