Mike Place
911cb0a856
Merge pull request #30879 from rhansen/docker-dont-remove-volume-if-driver-differs
...
Don't delete a Docker volume if the volume's driver differs
2016-02-04 14:04:44 -07:00
Mike Place
d340b5b8b0
Merge pull request #30883 from cachedout/fix_30601
...
Fix 30601
2016-02-04 13:58:53 -07:00
Richard Hansen
6b5b2c063d
change default for volume_present()'s force parameter to False
...
This is safer, as it avoids surprising the user with permanent data
loss.
2016-02-03 22:32:20 -05:00
Richard Hansen
255f5a1b91
add 'force' to replace (or not) volumes with driver mismatch
...
Add a new 'force' option that will cause volume_present() to delete
and re-create a volume if the existing volume's driver doesn't match
the specified driver. Set the default to True to preserve existing
behavior.
2016-02-03 19:32:13 -05:00
Mike Place
4f8264e28c
Fix failing test
2016-02-03 16:53:22 -07:00
Mike Place
618f823e21
Merge pull request #30774 from Unity-Technologies/feature/mac_package
...
Added ability to install PKG, DMG and APP files for OS X minions
2016-02-03 12:54:32 -07:00
Daniel Hobley
29a4c3958e
Removed possible shell injections as requested by PR feedback
2016-02-03 08:44:13 +01:00
Richard Hansen
cbda6446df
add additional states.dockerng.volume_present() unit tests
...
The unit tests now test for the bug fixed in the previous commit
(among other things).
2016-02-02 19:24:44 -05:00
Mike Place
e3f0c8e162
Merge pull request #30731 from Unity-Technologies/feature/osx_keychain
...
Added the ability to configure keychains on OSX
2016-02-02 08:03:14 -07:00
Mike Place
330abcad12
Merge pull request #30775 from Unity-Technologies/feature/mac_defaults
...
Added the ability to set OS X settings using defaults
2016-02-02 07:47:49 -07:00
Mike Place
e4ca01181b
Merge pull request #30803 from Unity-Technologies/feature/win_certutil
...
Added the ability to add and remove certificates from Windows minions
2016-02-02 07:04:30 -07:00
Daniel Hobley
2567ea6956
Lint fixes
2016-02-02 11:48:17 +01:00
Daniel Hobley
becb643557
Added ability to install and activate a windows license
2016-02-02 11:07:05 +01:00
Daniel Hobley
ddc24708ad
Added the ability to add and remove certificates from Windows minions
...
- Uses certutil.exe to add and remove certificates
2016-02-02 10:06:20 +01:00
Daniel Hobley
04877e06e7
Updated based on PR feedback
...
- Renamed type to vtype
- Made if statements a little more clear
2016-02-02 09:01:38 +01:00
Mike Place
86ea047933
Merge pull request #30734 from Unity-Technologies/feature/osx_assistive
...
Added ability to change assistive access on OSX 10.9+
2016-02-01 14:51:47 -07:00
Mike Place
68f4fd2fb3
Merge pull request #30697 from Unity-Technologies/feature/proxy-settings
...
Added ability to set proxy settings on OSX and Windows
2016-02-01 13:04:59 -07:00
Mark Kimsal
3cf387a3c6
Return mock string as MagicMock object
...
Attempt to fix unit tests by passing desired string return value
wrapped up in a MagicMock object.
2016-02-01 12:40:24 -05:00
Mark Kimsal
16c3ca6039
Changes for lint
2016-02-01 12:02:11 -05:00
Daniel Hobley
0a1da63d6a
Added the ability to set OS X settings using defaults
2016-02-01 15:24:02 +01:00
Daniel Hobley
8598262d4e
Lint fixes
2016-02-01 14:50:13 +01:00
Daniel Hobley
f701547027
Added ability to install PKG, DMG and APP files for OS X minions
2016-02-01 14:22:22 +01:00
Thomas S Hatch
e202ce1ce0
Merge pull request #30698 from Unity-Technologies/feature/win-firewall-icmp
...
Added the ability to enable icmp rules on Windows Firewalls
2016-01-31 12:09:29 -07:00
Colton Myers
291fe929e4
Merge pull request #30754 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2016-01-29 17:11:31 -07:00
Mike Place
b8a6a97307
Merge pull request #30695 from Unity-Technologies/feature/beacon-glxinfo
...
Added a beacon for GLXInfo
2016-01-29 17:13:20 -06:00
Mike Place
fe19ca4480
Merge pull request #30729 from Unity-Technologies/feature/dism
...
Added DISM module and states
2016-01-29 17:10:32 -06:00
Colton Myers
967e862027
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/loader.py
salt/modules/npm.py
salt/pillar/__init__.py
2016-01-29 15:51:52 -07:00
Colton Myers
84eeab7720
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/returners/local_cache.py
2016-01-29 14:57:31 -07:00
Daniel Hobley
6ad5014968
Lint fixes
2016-01-29 15:29:06 +01:00
Daniel Hobley
bb241c1931
Lint fixes
2016-01-29 15:18:16 +01:00
Daniel Hobley
a4f4e52687
Added xattr module and state for OS X
...
- Allows you to add and remove special attributes to/from files
2016-01-29 15:01:40 +01:00
Daniel Hobley
d80a637d2e
Added ability to change assistive access on OSX 10.9+
2016-01-29 13:59:51 +01:00
Daniel Hobley
3aeafd7f54
Lint fixes
2016-01-29 12:34:35 +01:00
Daniel Hobley
bae0543d95
Added the ability to configure keychains on OSX
2016-01-29 11:47:43 +01:00
Daniel Hobley
e8c3a154f0
Added DISM module and states
...
- Allows you to install features and capabilities on windows minions
2016-01-29 10:35:58 +01:00
Daniel Hobley
76a788529a
Merge branch 'develop' into feature/win-firewall-icmp
2016-01-29 09:35:41 +01:00
Daniel Hobley
efdc953867
Merge branch 'develop' into feature/proxy-settings
2016-01-29 09:35:31 +01:00
Daniel Hobley
76aa2fde84
Merge branch 'develop' into feature/beacon-glxinfo
2016-01-29 09:35:15 +01:00
Daniel Hobley
9ecfb56c33
Fixed a bug where new changes are detected when nothing changed in proxy state
2016-01-28 15:06:06 +01:00
Daniel Hobley
e40092a103
Added the ability to enable icmp rules on Windows Firewalls
...
- Added more checks in the unit tests
- Updated unit tests to check for ICMP rules
2016-01-28 14:38:50 +01:00
Daniel Hobley
6f266cdd73
Added ability to set proxy settings on OSX and Windows
2016-01-28 13:21:15 +01:00
Steve Hajducko
3544dd995e
Fix lsscsi issues for certain platforms
...
The lsscsi command doesn't support the '-s' flag on any RHEL/CentOs system
until RHEL7.
The command now have an option to specify 'get_size' to enable
compatibility with the older platforms.
Also fixes some issues with lsscsi not being installed and exceptions
getting thrown because of that.
2016-01-27 21:15:26 -08:00
rallytime
4fa80f2d5e
Merge branch '2015.8' into 'develop'
...
Conflicts:
- doc/ref/states/all/index.rst
- salt/cloud/__init__.py
- salt/minion.py
- salt/modules/file.py
- salt/modules/guestfs.py
- salt/modules/ipmi.py
- salt/modules/osquery.py
- salt/modules/parted.py
- salt/modules/seed.py
- salt/modules/virt.py
- salt/modules/yumpkg.py
- salt/modules/zypper.py
- salt/states/boto_elb.py
- salt/states/pkg.py
2016-01-26 16:19:39 -07:00
Nicole Thomas
d6e2c7aa82
Merge pull request #30614 from techhat/depimg
...
WIP: Deprecate salt/modules/img.py
2016-01-26 15:03:11 -07:00
Joseph Hall
29df2124a2
Remove tests for img.py since we're deprecating it
2016-01-26 11:00:38 -07:00
Colton Myers
5bc11d7539
Merge pull request #30631 from rallytime/fix-7811
...
Refactor rabbitmq_cluster states to use test=true functionality correctly
2016-01-26 09:23:49 -07:00
Mark Kimsal
6ceeea6b62
Add enabled, disabled, enable, disable to runit
...
New methods test if the standard 'run' file in the services folder has
the executable bit set. When the 'run' file is not executable, runit
will not launch the service on boot. This mimicks the enabled/diabled
behavior of other service providers.
The file permissions are set to 700 and 600 for enabled and disabled
states. Because of the ad-hoc nature that runit service files can
sometimes posess, the run files may have passwords or other sensitive
information. Therefore, the permissions are hard coded to only be
readable by the file owner, who is also the user who runs the process.
This brings the runit module more inline with other service providers
so when it is used in a state (with provider: runit) more options can
be used, like enabled: True
2016-01-26 08:25:44 -05:00
Colton Myers
621d8785de
Merge pull request #30579 from sjorge/module-localemod
...
Fix up salt.modules.locale(mod) for Solaris and some generic improvements
2016-01-25 17:21:42 -07:00
Colton Myers
64f17568a4
Merge pull request #30627 from sjmh/etcd_set_tree
...
Add etcd update function
2016-01-25 17:07:46 -07:00
rallytime
bf9ffded6d
Refactor rabbitmq_cluster states to use test=true functionality correctly
...
Fixes #7811
2016-01-25 16:47:54 -07:00
