Commit Graph

75737 Commits

Author SHA1 Message Date
Nicole Thomas
f7f7b987b3 Merge pull request #37619 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2016-11-11 11:44:09 -07:00
rallytime
b86e9270e7 Update "warn" to "warning" in verify_test 2016-11-11 09:05:44 -07:00
rallytime
5340edb9bb Keep the 'develop' branch setting in doc conf 2016-11-11 09:04:12 -07:00
Mike Place
40b2459638 Merge pull request #37631 from SolarisYan/patch-2
if password in profile,not overwrite it
2016-11-11 22:50:27 +13:00
Mike Place
7f13513c05 Merge pull request #37630 from skizunov/develop2
Add `info_installed` function to opkg module
2016-11-11 22:46:47 +13:00
SolarisYan
a59b07bf71 if password in profile,not overwrite it
if user provide password in profile,we shouldn't overwrite it
2016-11-11 13:03:48 +08:00
Sergey Kizunov
d97d857d39 Add info_installed function to opkg module
This is based on the `info_installed` function in the `zypper` module
in that it accepts an optional extra `attr` kwarg.

One extra feature it has is that it will return information on all
packages if no `names` are specified.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-11-10 22:31:14 -06:00
Mike Place
9751e19b61 Merge pull request #37615 from eradman/vmware
vmware: optionally allow network interface MAC to be set
2016-11-11 14:58:17 +13:00
Eric Radman
9a60e298bb vmware: optionally allow network interface MAC to be set
Example profile:

    network:
      Network Adapter 1:
        mac: '00:16:3e:e8:19:0f'
        name: vlan25
        switch_type: standard

This takes effect as soon as the VM is initialized, so PXE-booting can
take advantage of this.
2016-11-10 19:59:55 -05:00
rallytime
7b2341bbfd Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/file.py
  - salt/states/file.py
  - salt/utils/network.py
2016-11-10 15:59:51 -07:00
Nicole Thomas
8ba9ceda50 Merge pull request #37609 from rallytime/merge-2016.11
[2016.11] Merge forward from carbon to 2016.11
2016-11-10 15:48:43 -07:00
Mike Place
1492b1a114 Merge pull request #37583 from Mrten/patch-1
Add a section to the manual for the sqlite3 state that hints to module.run
2016-11-11 10:59:55 +13:00
Mike Place
f728977346 Merge pull request #37593 from skizunov/develop2
Make sure grains hw values are clean
2016-11-11 10:57:37 +13:00
Mike Place
fb763d91e8 Merge pull request #37594 from rallytime/fix-35381-develop
Don't completely replace grains dict when getting virtual data
2016-11-11 10:54:35 +13:00
Mike Place
403b469aea Merge pull request #37601 from eradman/random_org
Skip random.org tests for any communication failure
2016-11-11 10:52:25 +13:00
Nicole Thomas
7b00656d26 Merge pull request #18 from terminalmage/merge-2016.11
Raise exception, and also fix error with call to str.format()
2016-11-10 14:46:37 -07:00
Erik Johnson
3c51a67895 Raise exception, and also fix error with call to str.format() 2016-11-10 15:44:38 -06: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
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
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
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
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
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
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
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
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
Nicole Thomas
0564532924 Update release candidate docs with RC2 info (#37564) 2016-11-08 15:26:37 -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