Commit Graph

59965 Commits

Author SHA1 Message Date
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
Mike Place
4985cc57f1 Merge pull request #29726 from cachedout/disable_moto_2015_8
Disable some boto tests per resolution of moto issue
2015-12-15 15:15:35 -07:00
Mike Place
d19827fd3a Disable some boto tests per resolution of moto issue
Pending resolution of https://github.com/spulec/moto/issues/493
2015-12-15 14:59:14 -07:00
rallytime
45080f3629 Add examples of using multiple matching levels to Pillar docs
Fixes #29091
2015-12-15 14:57:36 -07:00
rallytime
8d8fdd0a27 Clarify db_user and db_password kwargs for postgres_user.present state function
Fixes #29152
2015-12-15 14:31:02 -07:00
rallytime
5c045a86af Link "stateful" kwargs to definition of what "stateful" means for cmd state.
Fixes #29154
2015-12-15 14:21:58 -07:00
Erik Johnson
761be9cb93 Fix display of multiline strings when iterating over a list
When iterating over a list, the prefix is a dash followed by a space.
However, the prefix was being prepended to each line of a string before
adding it to the output. This means that each line of the string appears
to be a distinct list element.

This commit fixes this issue by only prepending the prefix on the first
line of a multiline string. On all other lines, a prefix consisting of a
number of spaces equal to the length of the prefix is used, ensuring
that the mulitline string is consistently indented.
2015-12-15 14:56:30 -06:00
Mike Place
aba82abffd Merge pull request #29708 from lagesag/fix-file-directory-test-mode
Fix test=True for file.directory with recurse ignore_files/ignore_dirs.
2015-12-15 12:15:14 -07:00
Mike Place
52cc07cec9 Merge pull request #29646 from rallytime/fix-29488
Don't stacktrace on kwargs.get if kwargs=None
2015-12-15 12:02:58 -07:00
Mike Place
7c38dec0ad Merge pull request #29642 from cachedout/issue_29199
Correctly restart deamonized minions on failure
2015-12-15 12:02:40 -07:00
Mike Place
bd918394c3 Merge pull request #29599 from cachedout/clean_minion_shutdown
Clean up minion shutdown
2015-12-15 12:01:34 -07:00
Mike Place
31eb291caf Merge pull request #29675 from clinta/git-ls-remote-noref
allow returning all refs
2015-12-15 11:55:36 -07:00
rallytime
a0ed857c37 Install correct package version, if provided, for npm state.
Fixes #23343

We already have taken care of the correct formatting for either
a list of packages, or a single package name with 'pkg_list'. Let's
use it so the version information can be passed to the install
function as well as the name.
2015-12-15 11:43:45 -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