Commit Graph

68633 Commits

Author SHA1 Message Date
Denys Havrysh
b4cfebb107 Fix Salt failure after merge of #34683 2016-07-21 15:03:54 +03:00
Jorge Schrauwen
a7ff9524b0 drop parsing of vdevs, error passthrough from zpool cli 2016-07-21 01:07:20 +02:00
Jorge Schrauwen
25d6c8139b eliminate hardcoded vdev type from zpool state 2016-07-21 00:53:45 +02:00
Thomas S Hatch
77dce3920c update the state wrapper to include show_low_sls 2016-07-20 16:40:13 -06:00
Jorge Schrauwen
47b8dc946c salt.states.zpool - work with updates exec module 2016-07-21 00:38:35 +02:00
Jorge Schrauwen
a5a98845c7 salt.module.zpool - fix bug with properties on/off being parsed as true/false 2016-07-21 00:28:23 +02:00
Thomas S Hatch
1f34299a84 Check if a valid value is passed to unlyif/unless 2016-07-20 16:20:58 -06:00
Thomas S Hatch
1e8c585cd3 Fix #34345 2016-07-20 15:55:18 -06:00
Jorge Schrauwen
dd64494a19 salt.modules.zpool - drop vdev types to make it more future proof, fallback to zpool cli error messages 2016-07-20 23:43:47 +02:00
Gleb Goncharov
e50a6783ce SPM: packaging doesn't work in Python 2.6. Fixed. 2016-07-20 15:02:08 -06:00
Nicole Thomas
042646582f Merge pull request #34823 from rallytime/bp-25276
Back-port #25276 to 2015.8
2016-07-20 14:56:04 -06:00
Thomas S Hatch
7bda166e9d keep this beacon from stack tracing at the loader (#34825) 2016-07-20 14:55:22 -06:00
Nicole Thomas
b9db0b0036 Merge pull request #34824 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-07-20 14:54:35 -06:00
Thomas S Hatch
6c35d88268 Fix #34648 (#34828) 2016-07-20 14:49:52 -06:00
Thomas S Hatch
1ccf35eca4 fix beacon list to include all beacons being processed 2016-07-20 12:57:33 -06:00
rallytime
094731f4b6 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-07-20 12:32:08 -06:00
Jacob Hammons
a028796eff copy spm.1 man page during setup
Refs #25213
2016-07-20 12:21:08 -06:00
Thomas S Hatch
b5de492143 fix #34798 2016-07-20 12:13:24 -06:00
Thomas S Hatch
5ad6bd7307 fix #34796 2016-07-20 12:05:12 -06:00
Mike Place
98fa4a404e Merge pull request #34818 from jtand/mysql_state_integration_test_cleanup
Skip mysql state test if mysqladmin is not available
2016-07-20 10:10:35 -06:00
Justin Anderson
9abb6f91bb Skip mysql state test if mysqladmin is not available 2016-07-20 09:24:24 -06:00
Mike Place
62ef8fdb35 Merge pull request #34670 from isbm/isbm-osmajorrelease-grain-suse
Add "osmajorrelease" grain (2016.3)
2016-07-20 08:39:38 -06:00
Bo Maryniuk
5f5b802c0c Add option to master config reader on ignoring system exit for wrong configuration 2016-07-20 16:32:01 +02:00
Bo Maryniuk
6fc677f177 Ignore minion config errors everywhere but the minion itself 2016-07-20 16:32:01 +02:00
Bo Maryniuk
8699194647 Remove deprecation: BaseException.message deprecated as of 2.6 2016-07-20 16:32:01 +02:00
Bo Maryniuk
0e65cfec91 Fix lint: E8302 2016-07-20 16:32:01 +02:00
Bo Maryniuk
67faa56bf1 Use Salt default exit codes instead of hard-coded values 2016-07-20 16:32:01 +02:00
Bo Maryniuk
a84556e596 Exit immediately on configuration error 2016-07-20 16:32:01 +02:00
Bo Maryniuk
43d965907c Raise an exception on any found wrong configuration file 2016-07-20 16:32:01 +02:00
Bo Maryniuk
30ed728d05 Cover exception handling in the utils.parsers 2016-07-20 16:32:01 +02:00
Bo Maryniuk
5e8c0c6bdb Introduce configuration error exception 2016-07-20 16:32:01 +02:00
Mike Place
6ca9ffa7c7 Merge pull request #34683 from cachedout/issue_34215
Fix publisher leak
2016-07-20 07:57:10 -06:00
Mike Place
6636f2b449 Merge pull request #34803 from junovitch/issue_24744
salt/state.py: set `chunk['order'] = 0' with `order: first'; fixes #24744
2016-07-20 07:56:20 -06:00
Bo Maryniuk
a6bcbd615f Lintfix PEP8: E262 2016-07-20 15:26:18 +02:00
Jason Unovitch
64c850410f salt/state.py: set chunk['order'] = 0' with order: first'; fixes #24744
Currently the `order: first' keyword executes later states without order
options. Consider a test case such as:

```SaltStack
sleep 1:
  cmd.run:
    - order: first
sleep 2:
  cmd.run
sleep 3:
  cmd.run
sleep 4:
  cmd.run:
    - order: last
```

The contents of each chunk dictionary at runtime show that the 'first' state
is not evaluated to 'first'.

{'name': 'sleep 4', 'state': 'cmd', '__id__': 'sleep 4', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 1010100}
{'name': 'sleep 2', 'state': 'cmd', '__id__': 'sleep 2', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 10000}
{'name': 'sleep 3', 'state': 'cmd', '__id__': 'sleep 3', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 10001}
{'name': 'sleep 1', 'state': 'cmd', '__id__': 'sleep 1', 'fun': 'run', '__env__': 'base', '__sls__': u'test', 'order': 10100}
2016-07-19 21:17:40 -04:00
Mike Place
ccd53e9214 Lint 2016-07-19 15:50:23 -06:00
Mike Place
49ab3fd2b5 Merge pull request #34791 from sjorge/zpool-state-tweaks
salt.state.zpool tweaks
2016-07-19 14:56:47 -06:00
Mike Place
76eb46fb08 Document master setting 2016-07-19 14:50:23 -06:00
Mike Place
0dfe3aaf31 Set up dynamic config 2016-07-19 14:45:51 -06:00
Jorge Schrauwen
d48c6d2dcb accomidate use of "fake" vdev type disk, this behavior may be broken later if a disk vdev ever gets added to the cli tools. improve documentation explaining how to create a striped pool without the "fake" vdev type 2016-07-19 21:31:31 +02:00
Mike Place
3cfb82cdd4 Fix silly error 2016-07-19 13:29:02 -06:00
Mike Place
35a845fff5 Only set IPC with write buffer if set 2016-07-19 13:24:25 -06:00
Nicole Thomas
1617a7058a Merge pull request #34784 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-07-19 10:30:18 -06:00
Bo Maryniuk
110a422d5a Keep osmajorrelease as a string type for 2016.3 release 2016-07-19 17:52:08 +02:00
rallytime
3e032dc397 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-07-19 09:30:45 -06:00
Mike Place
58021035a9 Merge pull request #34773 from randomed/mysql-returner-startup/2015.8
Bugfix: Startup states on minions are not being written to mysql returner
2016-07-19 06:39:53 -06:00
Dave Ye
0cd55eb7d7 Add jid=req handling for mysql returner. It should also store the return jid into the jid list table. 2016-07-19 15:41:23 +10:00
Jacob Hammons
c3ae64c054 Updates man pages (#34756)
adds link to all tutorials to using salt section
Refs #33923
2016-07-18 15:36:50 -06:00
Mike Place
10a1af9949 Remove unnedeed config test (#34751)
Refs #34607
2016-07-18 13:00:47 -06:00
Mike Place
2a9738f00d Merge pull request #34746 from rallytime/azure-version
Update azure lib dep to match the one in cloud.clouds.msazure
2016-07-18 12:54:40 -06:00