Commit Graph

75815 Commits

Author SHA1 Message Date
Mike Place
e2f6d74680 Merge pull request #37717 from saltstack/revert-37649-develop
Revert "Add grains for the cloud metadata server"
2016-11-16 03:01:56 +00:00
Mike Place
506cef4eb6 Revert "Add grains for the cloud metadata server" 2016-11-16 16:00:59 +13:00
Solaris
a179f9f2f1 if vm state is not ACTIVE, it will fail (#37696)
* if vm state is not ACTIVE, associate floating ip to it will fail.So we should wait for state of vm is ACTIVE,then associate the assigned floating ip to it

* Pylint fix
2016-11-15 16:32:27 -07:00
Mike Place
1aa23c7a53 Merge pull request #37649 from gtmanfred/develop
Add grains for the cloud metadata server
2016-11-15 20:02:15 +13:00
Mike Place
c0d1c97c67 Merge pull request #37683 from smolaon/develop
fixed guestfs mounting for salt virt
2016-11-15 15:42:53 +13:00
Mike Place
8687dbc3b2 Merge pull request #37689 from eradman/joyent
joyent: Handle error if deployment fails
2016-11-15 15:41:58 +13:00
Mike Place
696b10a5e2 Check to see if a child is running before we try to kill it (#37693) 2016-11-14 19:22:17 -07:00
Mike Place
c8fb487590 Added space for lint check in in-line comment 2016-11-15 13:56:47 +13:00
Mike Place
1cf63cf235 Merge pull request #37688 from cachedout/npm_require_network
Require network for npm tests
2016-11-15 13:55:36 +13:00
Mike Place
bc65697502
Require network for npm tests 2016-11-15 12:45:17 +13:00
Eric Radman
a42ca638ec joyent: Properly handle error if deployment fails
Previous behavior if an invalid profile parameter was used:

TypeError: 'NoneType' object has no attribute '__getitem__'

New Behavior:

Error: There was a profile error: Failed to deploy VM

Also fix up some pylint complaints
2016-11-14 18:44:07 -05:00
Ondrej Smola
75b42e58a9 fixed guestfs mounting for salt virt 2016-11-14 22:46:50 +01:00
Daniel Wallace
25b0488114 Add grains for the cloud metadata server
My understanding is that this should always appear at 169.254.169.254.

This is specifically used with ec2 and openstack, and possible some
other cloud providers, but this format should work for the two I know
of.

Closes #37436
2016-11-14 15:03:18 -06:00
Nicole Thomas
62beea9750 Merge pull request #37672 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2016-11-14 12:16:12 -07:00
rallytime
1b5f89577e Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/cloud/clouds/vmware.py
2016-11-14 09:19:49 -07:00
Mike Place
c99e39e35f Merge pull request #37661 from m03/aptpkg-unit-tests
Add initial aptpkg unit tests
2016-11-13 21:14:21 +00:00
m03
8cb794addb Add initial aptpkg unit tests 2016-11-13 09:10:37 -08:00
Mike Place
8e62d1f8fb Merge pull request #37659 from m03/fix-32235-aptpkg-add_repo_key
Fix #32235 - add add_repo_key function
2016-11-13 06:59:19 +00:00
m03
7005763fa3 Add versionadded lines 2016-11-12 21:46:54 -08:00
m03
e895674a9d Fix #32235 - add add_repo_key function 2016-11-12 21:31:15 -08:00
Mike Place
0e38c4e622 Merge pull request #37636 from rajvidhimar/fix_commit_function
Change the confirm parameter in commit function
2016-11-12 21:14:48 +00:00
Mike Place
b049ad6ead Merge pull request #37658 from sjorge/develop-zoneadm
Want a zoneadm module
2016-11-12 20:32:05 +00:00
Mike Place
9fefaf7808 Merge pull request #37655 from oz123/update_grains_docs
Update grains documentation
2016-11-12 20:28:53 +00:00
Super-User
def3c303f4 Add support for uuid 2016-11-12 12:54:56 +01:00
Super-User
4faf7dc544 zoneadm.clone 2016-11-12 12:33:48 +01:00
Super-User
945121449c zoneadm.install and zoneadm.uninstall 2016-11-12 12:28:32 +01:00
Oz N Tiram
1ac9b96a76 Update grains documentation
Make it clear that changes to grains content require
 a refersh of modules.
2016-11-12 10:45:39 +01:00
Mike Place
48d0025d34 Merge pull request #37654 from eradman/_hw_data
Revert commit fb763d to unbreak salt-master on non-Linux systems
2016-11-12 01:15:50 +00:00
C. R. Oldham
7995f20dda Merge pull request #37652 from twangboy/fix_mac_power
Fix set_restart_freeze function
2016-11-11 16:04:05 -07:00
Eric Radman
a3bf714c74 Revert commit fb763d
This commit completely breaks the salt-master on all non-Linux systems:

fb763d91e8

Why?

_hw_data(osdata) is called before `osdata` includes the key 'kernel', resulting
in a KeyError.  Steps to reproduce:

(saltenv) $ salt-master -l debug
2016-11-11 16:34:02 -05:00
Mike Place
52dd60763d Merge pull request #37637 from rallytime/bp-37550
Back-port #37550 to 2016.11
2016-11-12 09:29:51 +13:00
Mike Place
182787e19d Merge pull request #37632 from twangboy/fix_versions_report
Fix versions report for Windows Server platforms
2016-11-12 09:22:43 +13:00
twangboy
df2ccc59fe Fix set_restart_freeze function 2016-11-11 12:50:11 -07:00
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
Tobias Macey
07c19a5e88 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-11 09:33:36 -07:00
Tobias Macey
7821bc89c7 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-11 09:33:36 -07:00
Tobias Macey
07e688dcff Fix parameter handling for boto_rds with boto3
The way that optional parameters are handled forces some of them to be
defined even when that is not necessary. Updated handling to use a
mapping of snake_case to CamelCase names and only include defined
parameters in the call to boto for the `create` and `modify` actions.
2016-11-11 09:33:36 -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
rajvidhimar
c20aab9738 Change the confirm parameter in commit function 2016-11-11 21:16:47 +05:30
twangboy
c4e36b3585 Fix some lint 2016-11-11 08:24:38 -07:00
Super-User
a2ef1e0b16 zoneadm.move and zoneadm.verify 2016-11-11 15:21:29 +01:00
Super-User
1530678def zoneadm.ready, zoneadm.* improve error handling 2016-11-11 15:06:47 +01:00
Super-User
a317c3acb4 zoneadm.attach and zoneadm.detach 2016-11-11 14:30:51 +01:00
Mike Place
737436a463 Merge pull request #37146 from cachedout/master_pub_error_reporting
Master publish error reporting
2016-11-11 22:52:31 +13: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
2c2dc93640
Fix test and check for jid not in pub_data 2016-11-11 15:37:47 +13:00