Commit Graph

59655 Commits

Author SHA1 Message Date
rallytime
3bfb87c031 Spelling fixes 2015-12-15 15:45:19 -07:00
rallytime
15c466cc12 Further clarifications on "unless" and "onlyif" requisites.
Fixes #14634

- "unless" is actually a NAND operator
- remove usage of "opposite of unless" as that is confusing
2015-12-15 15:42:56 -07:00
Mike Place
7c50533d3f Merge pull request #29683 from rallytime/vsan_fixes
Catch more specific error to pass the error message through elegantly.
2015-12-15 11:41:54 -07:00
Mike Place
30499e4896 Merge pull request #29687 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-12-15 11:38:46 -07:00
Mike Place
3c427e82bf Merge pull request #29681 from clinta/git-mirror
fix bare/mirror in git.latest
2015-12-15 11:37:16 -07:00
Colton Myers
b51cba59c0 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-12-14 15:44:21 -07:00
rallytime
afc003079e Catch more specifc error to pass the error message through elegantly. 2015-12-14 12:04:53 -07:00
Clint Armstrong
b387072a6f fix bare/mirror in git.latest 2015-12-14 13:53:00 -05:00
Mike Place
fe0778dad5 Merge pull request #29644 from rallytime/esxi-fixes
Fixed a couple more ESXi proxy minion bugs
2015-12-14 11:36:28 -07:00
Mike Place
ef2c9e3f61 Merge pull request #29645 from rallytime/bp-29558
Back-port #29558 to 2015.8
2015-12-14 11:11:38 -07:00
Mike Place
f606c23ea8 Merge pull request #29673 from rallytime/fix-29661
Default value should be False and not 'False'
2015-12-14 11:08:44 -07:00
rallytime
e4af7a1157 Default value should be False and not 'False'
If default is a string, then "if x" statements will be True, not False.
2015-12-14 09:10:39 -07:00
Ruxandra Burtica
2cf9374342 Replaced tabs with spaces. 2015-12-11 16:45:38 -07:00
Ruxandra Burtica
5e7e3fe682 Returning security group when no VPC id is given, even if the group is not in EC2-classic. 2015-12-11 16:45:38 -07:00
rallytime
577d5487a3 Fixed a couple more ESXi proxy minion bugs
- Don't log the salt.utils.vmware.esxcli command (shouldn't log password)
- Make sure we catch all ssh key changes possibilities in esxi state
- Provide a use-case example of why using a list of passwords for the host is a useful idea
2015-12-11 16:16:25 -07:00
Mike Place
a2a7f1527b Merge pull request #29632 from jfindlay/tls_virt
reduce severity of tls module __virtual__ logging
2015-12-11 13:11:32 -07:00
Justin Findlay
3ed6a052fd modules.tls.__virtual__: don't spam everyone's error log 2015-12-11 12:24:13 -07:00
Justin Findlay
76a200e780 modules.tls.__virtual__: refactor cert path comment 2015-12-11 12:20:08 -07:00
Justin Findlay
0a0532e598 modules.tls.__virtual__: remove redundant parens 2015-12-11 12:19:20 -07:00
Mike Place
f6f3aa6613 Merge pull request #29606 from abednarik/remove_duplicate_mtu_entry_rh7_net_template
Fixed duplicate mtu entry in RedHat 7  network configuration.
2015-12-11 10:24:45 -07:00
Mike Place
c7e73bc4c8 Merge pull request #29613 from rallytime/esxi-fixes
Various ESXi Proxy Minion Bug Fixes
2015-12-11 10:18:58 -07:00
Mike Place
a56c763423 Merge pull request #29628 from DSRCompany/bug/26364_freebsd_tcp
Don't create io_loop before fork
2015-12-11 10:15:11 -07:00
Dmitry Kuzmenko
729ffcae36 Don't create io_loop before fork 2015-12-11 18:57:27 +03:00
abednarik
afb2f887ba Fixed duplicate mtu entry in RedHat 7 network configuration.
Removed duplicate mtu entry in jinja template for RedHat 7 Systems.
2015-12-10 23:05:32 -03:00
rallytime
aa5dd88b6f Various ESXi Proxy Minion Bug Fixes
Including, but not limited to:

- Quote ESXCLI password to handle password spaces
- Only return vsan disk names instead of disk objects for vsan funcs
- Add warning to quote "on" and "off" service policy states
- Catch vmodl.fault.SystemError Errors when resetting passwords
2015-12-10 17:16:08 -07:00
Mike Place
41b8117237 Merge pull request #29609 from basepi/salt-ssh.umask.29574
[2015.8][salt-ssh] Add ability to set salt-ssh command umask in roster
2015-12-10 15:52:26 -07:00
Colton Myers
0afa5b0d5d Add cmd_umask to roster docs 2015-12-10 14:51:43 -07:00
Colton Myers
5c03f892bc Allow setting the cmd_umask from within the roster 2015-12-10 14:49:42 -07:00
Colton Myers
1e394f5ab1 Merge pull request #29603 from basepi/orchestrate.failures.29546
Fix orchestration failure-checking
2015-12-10 14:23:57 -07:00
Mike Place
b5b80b9324 Merge pull request #29597 from terminalmage/issue29584
dockerng: Prevent exception when API response contains empty dictionary
2015-12-10 12:57:42 -07:00
Mike Place
ffb54cced7 Merge pull request #29596 from rallytime/bp-29587
Back-port #29587 to 2015.8
2015-12-10 12:57:18 -07:00
Colton Myers
2bdcadaa27 Remove unnecessary and 2015-12-10 12:29:18 -07:00
Colton Myers
501f91a388 Fix error in failure checking for salt.state within orchestration 2015-12-10 12:22:17 -07:00
Erik Johnson
d68067b5db dockerng: Prevent exception when API response contains empty dictionary
Fixes #29584.
2015-12-10 10:38:30 -06:00
Job Snijders
bfb75ce363 Fix the 'cidr' arg in salt.modules.network.ip_addrs6()
The two arguments to ip_in_subnet() should be swapped around, but
since ip_in_subnet() is being deprecated in favor of in_subnet(),
removing three characters seemed like the most appropiate bugfix.

This fixes #29585
2015-12-10 09:31:19 -07:00
Mike Place
08dd663a27 Merge pull request #29588 from rallytime/esxi-proxy-tutorial
Added ESXi Proxy Minion Tutorial
2015-12-10 09:17:51 -07:00
rallytime
5a2bb260d3 Added ESXi Proxy Minion Tutorial
Also added some more documentation to other ESXi-related files
and fixed some related doc errors.
2015-12-09 18:00:20 -07:00
Mike Place
fe5db23863 Merge pull request #29572 from gtmanfred/2015.8
[nova] use old discover_extensions if available
2015-12-09 10:35:42 -07:00
Daniel Wallace
d0ffa520f4 use old discover_extensions if available
This was moved in 2.24.0, but this should work for everything back to 2.6.1

Closes #29557
2015-12-09 10:42:44 -06:00
Mike Place
ecbc60ba05 Merge pull request #29545 from terminalmage/issue29009
git.latest: init submodules if not yet initialized
2015-12-09 09:19:42 -07:00
Mike Place
3b2c93a2e5 Merge pull request #29548 from rallytime/bp-29449
Back-port #29449 to 2015.8
2015-12-09 09:19:07 -07:00
Mike Place
fd67903bf9 Merge pull request #29547 from rallytime/esxi-proxy
Refactored ESXCLI-based functions to accept a list of esxi_hosts
2015-12-09 09:08:03 -07:00
Mike Place
21437f9235 Merge pull request #29563 from alprs/fix-influx_deprecated_method
Fix a call to deprecated method in python-influxdb
2015-12-09 09:00:24 -07:00
Mike Place
f29e0a7021 Merge pull request #29565 from bdrung/2015.8
Fix typos and missing release note
2015-12-09 08:59:20 -07:00
Andreas Lutro
7c69c177ed update test 2015-12-09 13:18:47 +01:00
Andreas Lutro
46d7d92069 fix a call to deprecated method in python-influxdb
1da39bf860/influxdb/influxdb08/client.py (L543-L553)
2015-12-09 13:16:10 +01:00
Joe Healy
b96d8ff1d9 Minor update to release notes for missing fix
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2015-12-09 12:30:52 +01:00
Benjamin Drung
e72354aac4 Fix typo specfic -> specific 2015-12-09 12:19:39 +01:00
Benjamin Drung
5708355762 Fix typo comparsion -> comparison 2015-12-09 12:17:49 +01:00
Akhter Ali
3715cd7d65 Adding message for null public IP 2015-12-08 17:18:18 -07:00