Commit Graph

64871 Commits

Author SHA1 Message Date
Nicole Thomas
b8009d7320 Merge pull request #30552 from twangboy/mac_pkgutil
Renamed darwin_pkgutil.py to mac_pkgutil.py
2016-01-25 10:47:57 -07:00
Nicole Thomas
fb0054afb5 Merge pull request #30556 from twangboy/mac_sysctl
rename darwin_sysctl.py to mac_sysctl.py
2016-01-25 10:46:04 -07:00
Nicole Thomas
190d22b1c3 Merge pull request #30558 from twangboy/mac_desktop
renamed osxdesktop.py to mac_desktop.py
2016-01-25 10:45:09 -07:00
Nicole Thomas
625559c7af Merge pull request #30566 from twangboy/mac_power
Mac power
2016-01-25 10:44:34 -07:00
Nicole Thomas
1304dbb667 Merge pull request #30575 from sjorge/pkg-smartos
smartos packages are frozen so adding modules via pip does not work, …
2016-01-25 10:40:21 -07:00
Jorge Schrauwen
98664445c7 Swapping one unknow for debian failed, because debian use a different
function internally. Switched to RedHat for the test as it returns
LANG=XYZ
2016-01-25 17:38:51 +00:00
Nicole Thomas
9879cadfab Merge pull request #30585 from sjorge/module-mdata
implement salt.module.smartos_mdata
2016-01-25 10:38:49 -07:00
Kris Raney
e10a10050b Put in pylint forward compatibility recommendation. 2016-01-25 11:33:05 -06:00
Jorge Schrauwen
e4c511de4a update tests, we have a correct return now 2016-01-25 17:30:23 +00:00
Nicole Thomas
d5b8ecf579 Merge pull request #30607 from eyj/pr-snapshot-credentials
Fix credentials passing in boto_ec2.snapshot_created
2016-01-25 10:19:53 -07:00
Nicole Thomas
a06734c4ec Merge pull request #30591 from mlalpho/salt-cloud-clouds-ec2-AssociatePublicIpAddress-fix
salt-cloud-clouds-ec2 AssociatePublicIpAddress fix
2016-01-25 10:03:07 -07:00
Michal Suba
603029bc04 Update mysql.py
fixed trailing whitespace
2016-01-25 18:00:35 +01:00
Nicole Thomas
eb771585f9 Merge pull request #30602 from seanjnkns/pillar_merge_lists-doc-bug
Fix documentation for pillar_merge_lists which default is False, not …
2016-01-25 09:54:52 -07:00
Kris Raney
92cf88e5fd Retry waiting for IAM role to be propagated 2016-01-25 10:50:22 -06:00
Nicole Thomas
afdbb745c6 Merge pull request #30581 from JacobCWard/develop
Fixes #30569
2016-01-25 09:36:03 -07:00
Michael Alphonso
22f6009030 fixed 2016-01-25 11:25:01 -05:00
Michael Alphonso
7448cccc58 fixed 2016-01-25 11:23:48 -05:00
EYJ
27ecac04a0 Fix credentials passing in boto_ec2.snapshot_created 2016-01-25 17:18:46 +01:00
EYJ
48089e3e80 Allow setting of tags with value None 2016-01-25 17:18:14 +01:00
Nicole Thomas
48b2f506fb Merge pull request #30593 from mlalpho/salt-boto_vpc-updates
salt-boto_vpc updates
2016-01-25 08:55:08 -07:00
Sean Jenkins
841192ee2d Fix documentation for pillar_merge_lists which default is False, not True. From PR #30062 2016-01-25 08:49:13 -07:00
Michal Suba
61217a73a2 addressing #29265
column name for password string has changed since MySQL 5.7 . This commit adds ability to specify it as parameter
2016-01-25 16:48:56 +01:00
Nicole Thomas
09f9f78d94 Merge pull request #30534 from rmohr/copr
COPR project moved
2016-01-25 08:39:34 -07:00
Michael Alphonso
65ba18c18f line ending 2016-01-25 10:29:17 -05:00
Jorge Schrauwen
ef4b5a5836 update naming to match closer with mdata-* tools 2016-01-25 09:18:19 +00:00
Roman Mohr
044fe44ae9 COPR project moved
Replace old url http://copr.fedoraproject.org with
https://copr.fedorainfracloud.org to fix broken bootstrap script.
2016-01-24 18:43:02 +01:00
Michael Alphonso
31cc97ccf4 looks like a re-merge of PR #20972 which relates to #19288 2016-01-24 12:12:15 -05:00
Michael Alphonso
a454df55c4 - added log info while waiting. displays current status and wait time.
- updated conditional check for wait status to check for specified status from state sls data.
  + previously was only checking to see if the current status was in ['available', 'modifying', 'backing-up'], which defeats the purpose of specifying wait_status at all.
  + PR forces state run to wait until the specified status is returned. So, if you specify 'available' in the state, you know the database instance can be contacted when the state run returns.
- Updated call for get_endpoint to make sure the Endpoint and its Address are set
- spelling error in state
2016-01-24 12:08:34 -05:00
Michael Alphonso
2e30c0fed2 - explicitly defined input arguments
- added defaults to some arguments in the function definitions
2016-01-24 12:04:48 -05:00
Michael Alphonso
a3c782762d - explicitly defined input arguments 2016-01-24 12:00:54 -05:00
Michael Alphonso
8053727e7d - shortened mkdir command to include setting mode.
- removed `sh -c` call to subshell for mkdir since root_cmd already wraps the command in `sh -c` -- and mkdir wasn't behaving when called from subshell
 - updated conditional check to take ownership of new folder when using sudo
 - some spelling/grammar changes
2016-01-24 11:55:19 -05:00
Jorge Schrauwen
de5393bd41 mdata.get without parameter should return all properties, optimizations 2016-01-24 12:34:57 +00:00
Jorge Schrauwen
922267df05 implement salt.module.smartos_mdata 2016-01-24 12:24:45 +00:00
Jacob Ward
40d9e6f505 Fixes #30569 2016-01-23 16:47:40 -07:00
Jorge Schrauwen
e7adfd70a2 zone_compare should work on Solaris-like operating systems, else salt.states.timezone will repeately set the timezone even if it is already set. We do not have files to hash and compare, so we settle for simple string comparison instead. 2016-01-23 23:25:10 +00:00
Jorge Schrauwen
cb08eb4294 Change behavior to match unit test 2016-01-23 23:02:30 +00:00
Jorge Schrauwen
745f203ea3 unit test, better to test with unknown os_family, we expect "" result without patching cmd.run 2016-01-23 22:56:00 +00:00
Jorge Schrauwen
d153f43771 unit test was filling in fake os_familiy, new code skips the expensive cmd_run unknown os_family 2016-01-23 22:53:07 +00:00
Jorge Schrauwen
941bd0483f salt.module.localemod solaris support 2016-01-23 22:45:46 +00:00
Jorge Schrauwen
701b240224 fix indent 2016-01-23 14:04:13 +00:00
Jorge Schrauwen
8417f8da08 drop augeas as libaugeas is a pain to patch 2016-01-23 14:02:59 +00:00
Jorge Schrauwen
83b6935ab0 including said modules, would probably be a good idea too 2016-01-23 13:32:18 +00:00
Jorge Schrauwen
a48c7b6b2b smartos packages are frozen so adding modules via pip does not work, include a few more by default 2016-01-23 13:10:05 +00:00
twangboy
cec969db15 Fixed more tests 2016-01-22 19:24:38 -07:00
twangboy
aa47a2908f Fixed more lint 2016-01-22 19:20:24 -07:00
twangboy
3fcf9b4ba8 Fixed some lint 2016-01-22 19:15:29 -07:00
twangboy
e09f43b11b even more lint 2016-01-22 19:09:08 -07:00
twangboy
fef54563b0 More lint 2016-01-22 19:04:03 -07:00
twangboy
306d13a7fa Fixed tests 2016-01-22 17:36:48 -07:00
twangboy
1c58318013 Fixed tests 2016-01-22 17:32:42 -07:00