Jonathan Ballet
6922da46dc
doc: fix warnings + some rendering issues
2015-12-21 13:26:02 +01:00
Colton Myers
50f48c4bf3
Merge pull request #29850 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-12-18 14:33:49 -07:00
Colton Myers
7402599c62
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
2015-12-18 13:55:15 -07:00
Mike Place
05d2aaaef2
Merge pull request #29811 from alprs/feature-influxdb_retention
...
influxdb: add retention policy module functions
2015-12-18 10:19:02 -07:00
Mike Place
7eefaac58a
Merge pull request #29814 from basepi/multi-master.windows.29396
...
[2015.8][Windows] Fix multi-master on windows
2015-12-18 10:16:52 -07:00
Mike Place
fb4eb28645
Merge pull request #29819 from rallytime/esxi-docs
...
Add esxi module and state to docs build
2015-12-18 09:20:27 -07:00
Mike Place
e865c787a4
Merge pull request #29832 from jleimbach/fix-keyboard.py-for-rhel-without-systemd
...
Fixed typo in order to use the keyboard module for RHEL without systemd
2015-12-18 09:04:57 -07:00
jle
7b72b3c52c
Fixed typo in order to use the keyboard module for RHEL without systemd
2015-12-18 09:12:29 +01:00
rallytime
e7c5863468
Add esxi module and state to docs build
...
Also fixed some minor doc errors
2015-12-17 16:33:59 -07:00
Colton Myers
2405501d75
Add documentation for tcp ipc_mode and multi-master
2015-12-17 14:08:41 -07:00
Colton Myers
307e867980
For tcp ipc_mode, give each minion different pub/pull ports
2015-12-17 13:59:25 -07:00
Andreas Lutro
51088d938a
add tests, rename a function to more closely mirror influxdb
2015-12-17 21:58:51 +01:00
Andreas Lutro
785da17a67
missing comma
2015-12-17 21:43:42 +01:00
Colton Myers
5a21893e82
Fix ipc_mode check in windows
...
Although 'tcp' is the only supported ipc_mode in windows, this
check was completely wrong and would never allow overriding it.
2015-12-17 13:25:47 -07:00
Andreas Lutro
7e9e9a1030
influxdb: add retention policy module functions
2015-12-17 20:07:00 +01:00
Mike Place
4044f3bb93
Merge pull request #29803 from rallytime/vsphere-docs
...
Add vSphere module to doc ref module tree
2015-12-17 11:52:56 -07:00
Mike Place
9b4c2194f6
Merge pull request #29767 from abednarik/network_mod_hpstname_fix
...
Hosts file update in mod_hostname.
2015-12-17 11:31:18 -07:00
Mike Place
0c65eeb82b
Merge pull request #29772 from terminalmage/issue29631
...
pygit2: skip submodules when traversing tree
2015-12-17 11:23:16 -07:00
Mike Place
1b430b251f
Merge pull request #29765 from gtmanfred/2015.8
...
allow nova driver to be boot from volume
2015-12-17 11:20:33 -07:00
rallytime
3b7f5540ec
Add vSphere module to doc ref module tree
2015-12-17 10:54:28 -07:00
Mike Place
c4f226f31e
Merge pull request #29773 from l2ol33rt/debian_install_docfix
...
Append missing wget in debian installation guide
2015-12-17 10:29:18 -07:00
Mike Place
aca4da3abc
Merge pull request #29800 from rallytime/bp-29769
...
Back-port #29769 to 2015.8
2015-12-17 10:28:52 -07:00
Aditya Kulkarni
10bfcb8cb0
Add documentation about scopes (GCE)
2015-12-17 09:42:15 -07:00
abednarik
eebd3e3e4a
Hosts file update in mod_hostname.
...
In systems with systemd now you can use hostnamectl to set hostname. In this case
if hostnamectl exists mod_hostname will use it and return, leaving hosts file as it is,
which is a not expected behavior.
Also now setting the hostname based on commands avaiables or os are
grouped in a single block, which is cleaner I think.
Also update the way to get the current hostname using hostnamectl
Fixes #29751
2015-12-17 10:19:58 -03:00
Thomas S Hatch
ab61f78295
Merge pull request #29775 from lyft/listen-id-declaration-resolution-stable
...
Change listen requisite resolution from name to ID declaration
2015-12-16 15:56:03 -07:00
Erik Johnson
8c4ea64b0d
pygit2: skip submodules when traversing tree
...
Submodules cannot at this time be traversed by Pygit2 in the same way as
directories. Ignore them when traversing to get the file_list or
dir_list.
Fixes #29631
2015-12-16 16:30:25 -06:00
Daniel Wallace
e95f7561c5
cloudnetworks should be making public_ips a list
2015-12-16 16:23:14 -06:00
Paul Fisher
ff3a809c11
Change listen requisite resolution from name to ID declaration
2015-12-16 13:54:49 -08:00
Robert James Hernandez
64cb4b0540
Append missing wget in debian installation guide
2015-12-16 13:44:35 -08:00
Daniel Wallace
ec7e45fbfb
add documentation for boot from volume on nova driver
2015-12-16 13:41:12 -06:00
Daniel Wallace
eafcc5e3ac
Add boot from volume for openstack nova
...
This will allow for mapping block storage devices to servers on boot, by either
using prebuilt cinder volumes, making new ones
centos7-2-iad-cloudqe4:
provider: cloudqe4-iad
size: general1-2
block_device:
- source: image
id: 6595f1b7-e825-4bd2-addc-c7b1c803a37f
dest: volume
size: 100
shutdown: preserve
bootindex: 0
block_device and ephemeral need to be lists of dictionaries.
the others are strings
2015-12-16 13:25:20 -06:00
Mike Place
5af64b64f2
Merge pull request #29754 from rallytime/bp-29719
...
Back-port #29719 to 2015.8
2015-12-16 10:25:50 -07:00
gqgunhed
ed275977e3
fixed: include all items from kern.disks split
...
salt['grains.get']('disks') always dropped the last disk (first in returned list from sysctl).
"sysctl -n" does not include sysctl-name, so the [1:] offset was wrong.
2015-12-16 09:26:30 -07:00
Mike Place
b3f17fdaf8
Merge pull request #29713 from The-Loeki/patch-1
...
Pillar-based cloud providers still forcing use of deprecated 'provider'
2015-12-16 07:51:31 -07:00
Mike Place
1f4810be0f
Merge pull request #29729 from rallytime/fix-14634
...
Further clarifications on "unless" and "onlyif" requisites.
2015-12-16 07:45:06 -07:00
Mike Place
f43f3d166c
Merge pull request #29730 from rallytime/fix-24698
...
Update docker-py version requirement to 0.6.0 for dockerio.py files
2015-12-16 07:44:40 -07:00
Mike Place
7084f79199
Merge pull request #29737 from akissa/fix-pillar-sqlite3-examples
...
fix pillar sqlite3 documentation examples
2015-12-16 07:41:57 -07:00
Mike Place
e977096409
Merge pull request #29743 from akissa/fix-pillar-sqlite3-does-not-honour-config
...
fix pillar sqlite not honouring config options
2015-12-16 07:40:27 -07:00
Andrew Colin Kissa
6184fb1ae1
fix pillar sqlite not honouring config options
...
Fixes #29741
2015-12-16 14:20:16 +02:00
Andrew Colin Kissa
1c98f8d609
fix pillar sqlite3 documentation examples
...
Fixes #29736
2015-12-16 12:58:26 +02:00
Ronald van Zantvoort
35fe2a5c18
lint fix
2015-12-16 02:02:11 +01:00
rallytime
120fd5fdf0
Update docker-py version requirement to 0.6.0 for dockerio.py files
...
Fixes #24698
2015-12-15 17:08:53 -07:00
Mike Place
2cea0b0a2d
Merge pull request #29723 from rallytime/fix-29152
...
Clarify db_user and db_password kwargs for postgres_user.present state function
2015-12-15 16:58:43 -07:00
Mike Place
30eab23c43
Merge pull request #29722 from rallytime/fix-29154
...
Link "stateful" kwargs to definition of what "stateful" means for cmd state.
2015-12-15 16:25:47 -07:00
Mike Place
c393a4175a
Merge pull request #29715 from rallytime/fix-23343
...
Install correct package version, if provided, for npm state.
2015-12-15 16:19:45 -07:00
rallytime
45b77fb288
Add note about shell truthiness vs python truthiness
2015-12-15 16:14:31 -07:00
Mike Place
c9ca1a371e
Merge pull request #29724 from rallytime/fix-29091
...
Add examples of using multiple matching levels to Pillar docs
2015-12-15 16:02:32 -07:00
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
1310afbbc2
Merge pull request #29721 from terminalmage/nested-output-multiline-fix
...
Fix display of multiline strings when iterating over a list
2015-12-15 15:16:10 -07:00
