Commit Graph

75900 Commits

Author SHA1 Message Date
Erik Johnson
71032f8da5 Documentation improvements and corrections (#37604)
An earlier change (178ff08) introduced inaccurate information into the
documentation. This commit corrects that inaccuracy. It also adds some
clarifications to which SSH URL formats are supported, clarification
that the ``branch`` parameter refers to the local branch, and that
``user`` refers to the system user and not the http(s)/ssh auth user.
Lastly, some cleanup of improper RST formatting has been done.
2016-11-10 14:12:48 -07:00
Nicole Thomas
9b71f3fa6d Merge pull request #17 from terminalmage/merge-2016.11
Resolve merge conflict and integrate bugfix with 2016.11 branch
2016-11-10 13:23:50 -07:00
Erik Johnson
39e5fc41c2 Resolve merge conflict and integrate bugfix with 2016.11 branch 2016-11-10 14:04:06 -06:00
Daniel Wallace
74aee1e372 allow multiline returns from docker for mac
Nothing actually specifies the number of lines the docker api returns,
so we need to allow for more than one line to be returned which this
specfic docker returner does
2016-11-10 13:08:44 -06:00
Joseph Hall
9e0f517985 Try the connection again, in case it's been reset 2016-11-10 12:00:08 -07:00
Nicole Thomas
eea781a9ac Update the docbuild settings for 2016.11 branch (#37606) 2016-11-10 10:47:25 -07:00
Nicole Thomas
06786f9617 Remove the v from the tag reference (#37595)
When installing with pip, we just need the package version. No `v`.
2016-11-10 09:41:34 -07:00
Aditya Kulkarni
a7e09f9260 Use existing VM's VDD size if not specified in the cloud profile (#37579) 2016-11-10 09:41:11 -07:00
Dominik Szopa
15c40813f5 Added Packet cloud driver (#37542)
* Added packet cloud driver

* Pylint fixes

* Fixed pylint errors

* More pylint fixes
2016-11-10 08:47:18 -07:00
Dmitry Kuzmenko
d3d987b19c Handle master restart in appropriate places using salt.event listener. 2016-11-10 18:07:09 +03:00
Eric Radman
671cebfa30 Skip random.org tests for any communication failure
This test connects to random.org, which may throws the following error
on one network I manage:

ssl.SSLError: [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:590)

Other errors are possible, such as `socket.error`.  Since it is
difficult to anticipate the failure mode, skip these tests if https
communication provokes any exception.

Also, this is not a unit test--it's more of a system test. My
recommendation that we recategorize this as an integration test where
global IPv4 routing can more reasonably expected.
2016-11-10 07:48:24 -05:00
Michael Calmer
3530b542f0 change TIMEZONE on SUSE systems (bsc#1008933) 2016-11-10 11:00:50 +01:00
Mrten
db3d6ce0c3 fix whitespace at end of line 2016-11-10 09:10:53 +01:00
Mike Place
01b3883650 Merge pull request #37550 from mitodl/boto_rds_parameter_fix
Fix parameter handling for boto_rds with boto3
2016-11-10 13:51:26 +13:00
Mike Place
27140765b5 Py3 compat with range 2016-11-10 13:48:51 +13:00
Mike Place
fdd13b4145 Merge pull request #37540 from yhekma/2016.3
Added prefix to tempfile for template
2016-11-10 13:37:17 +13:00
Tobias Macey
bdcefa147f Addressing failures and inconsistency in parameter group handling
The `describe_parameters` function in the boto_rds execution module was
using inconsistent return data depending on where in the function the
return was generated. There were also inappropriate uses of `bool` that
resulted in incorrect return values.

The `parameter_present` state was also incorrectly accessing invalid
keys in the return data from `describe_parameters`. Updated to properly
use the data returned to check for existence of parameters.
2016-11-09 19:19:56 -05:00
rallytime
55662bc188 Don't completely replace grains dict when getting virtual data
Fixes #35381
2016-11-09 16:19:47 -07:00
Sergey Kizunov
5fe94a46bf Make sure grains hw values are clean
When a hardware value is retrieved via the smbios module, this is
already done. Add hardware value cleaning to all other methods of
retrieving the hardware values.

When the hardware value is not clean, `None` is returned for the
hardware value.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-11-09 17:13:37 -06:00
Mike Place
793f82fa29 Merge pull request #37574 from skob/develop
Fix: change tuples to list for key+cert pairs (https).
2016-11-10 11:45:52 +13:00
Mike Place
f7a20f5784 Merge pull request #37576 from DSRCorporation/features/37449_tls
Basic SSL/TLS support in master-minion communication.
2016-11-10 11:38:00 +13:00
Mike Place
6b0a29f6d6 Merge pull request #37589 from dmurphy18/fix_rpmbuild
Update parameter for building with mock for rpms
2016-11-10 11:09:48 +13:00
Amir Pakdel
0810ebb789 Fix the case both DNS count and order changes in Windows (#37587)
In case both number of DNS servers and their order
changes, while checking for the order, we will get
IndexError: list index out of range
2016-11-09 14:05:09 -07:00
Eric Radman
b19440418d Fixes to unit tests (#37586)
Add skipIf pyvmomi is not installed

    NameError: global name 'vmodl' is not defined
    NameError: global name 'vim' is not defined

Fix skipIf typo for OpenBSD

    >>> import sys
    >>> sys.platform
    'openbsd6'

Avoid warning from glusterfs.py:

    Use specific 'len(elem)' or 'elem is not None' test

Enable boto_secgroup_test tests that work now:

    test skipped due to error in moto return - fixed in
    cc01669643
2016-11-09 13:58:08 -07:00
Clint Armstrong
5e80accd82 Update for m2crypto changes removing lhash (#37578)
* Update for m2crypto changes removing lhash

* linting issues
2016-11-09 13:47:26 -07:00
Vasili Syrakis
c6cd39a1c0 Make the match more specific (#37538) 2016-11-09 13:42:11 -07:00
Seth House
b3f436e14d Add a yaml sdb module (#37563)
* Add a yaml sdb module

* Fix bad release codename

* Add default to profile argument
2016-11-09 13:39:50 -07:00
Clint Armstrong
928462df1d fix example of function argument limiting (#37584) 2016-11-09 13:37:18 -07:00
David Murphy
0e0ff2d374 Update parameter for building with mock for rpms 2016-11-09 13:16:56 -07:00
rallytime
f44e14b63c Merge branch 'carbon' into '2016.11'
Conflicts:
  - salt/modules/file.py
2016-11-09 12:56:58 -07:00
Erik Johnson
2810b85cac Add a test to ensure we don't check for fast-forward before fetching (#37571) 2016-11-09 12:43:25 -07:00
Nicole Thomas
7036707fbf Back-port #37569 and #37581 to 2016.11 (#37585)
* Remove known issues section for rc2

All of these have been fixed in the latest rc

* Add smartOS RC build instructions back to RC docs

And update the links to the new packages
2016-11-09 10:39:07 -07:00
Nicole Thomas
b24992ea38 Update release candidate docs with RC2 info (#37568) 2016-11-09 10:19:11 -07:00
Nicole Thomas
2c6a8748fe Add smartOS RC build instructions back to RC docs (#37581)
And update the links to the new packages
2016-11-09 10:09:03 -07:00
Mrten
772a19db9a Fix typo 2016-11-09 17:36:39 +01:00
Mrten
208eb10bd3 Added a hint how to run random sqlite queries 2016-11-09 17:31:47 +01:00
Dmitry Kuzmenko
aec6d55b7c Basic SSL/TLS support in master-minion communication.
Allows to set paths to `ssl_cert` and `ssl_key` in master and minion
opts. Encrypts the TCP channel with the given keys for tcp transport.
2016-11-09 16:03:47 +03:00
Tobias Macey
4efc7727a9 Fixing check for parameter group
The current implementation will return an invalid response if the
requested parameter group is not present. Added a check for the
parameter group not found error case and set the exists value in the
return to False.
2016-11-09 07:26:25 -05:00
SK
e8d8d9211b Fix: change tuples to list for key+cert pairs (https). 2016-11-09 13:48:33 +03:00
Nicole Thomas
19dcace679 Remove known issues section for rc2 (#37569)
All of these have been fixed in the latest rc
2016-11-08 16:46:01 -07:00
Mike Place
43a2e51d94 Merge pull request #37544 from github-abcde/features/pillar_enc_in_orchestrate
Added pillar_enc variable to orchestrate to be passed through
2016-11-09 12:17:26 +13:00
Mike Place
b01c247ea9 Merge pull request #37553 from rallytime/bp-37521
Back-port #37521 to 2016.3
2016-11-09 12:11:07 +13:00
Mike Place
694df30d40 Merge pull request #37565 from rallytime/bp-37549
Back-port #37549 to 2016.3
2016-11-09 12:10:25 +13:00
Nicole Thomas
0564532924 Update release candidate docs with RC2 info (#37564) 2016-11-08 15:26:37 -07:00
Erik Johnson
2fc0b222bc Fix regression in service.dead state (#37562)
* Fix regression in service.dead state when service is not available

This was originally broken in c4f899b.

* Add unit test for issue 37511
2016-11-08 14:58:33 -07:00
Seth House
ac754dbac5 Skip config type checking for sdb values (#37560) 2016-11-08 14:57:47 -07:00
Nicole Thomas
0fe7b37e1d Merge pull request #37561 from rallytime/merge-carbon
[carbon] Merge forward from 2016.3 to carbon
2016-11-08 14:39:52 -07:00
Mrten
c92a90b8e5 Update sqlite3.py
change boron to 2016.3.0. as requested
2016-11-08 14:11:00 -07:00
Mrten
fb76557a2a sqlite is not found in 2015.8
first appearance is boron
2016-11-08 14:10:59 -07:00
Mrten
43bef5fbb9 sqlite is not found in 2015.8 (#37549)
* sqlite is not found in 2015.8 

first appearance is boron

* Update sqlite3.py

change boron to 2016.3.0. as requested
2016-11-08 14:09:51 -07:00