Commit Graph

78184 Commits

Author SHA1 Message Date
Joseph Hall
2ed2932387 Clean up debug logs 2017-02-03 14:24:51 -07:00
Joseph Hall
671282656a Raise an error for a disk size that is too small 2017-02-03 14:21:59 -07:00
Raine Curtis
5dc92b421e Added missing source_hash_name argument in get_managed function
Additional fix to  #33187
Customer was still seeing errors, this should now work.
Tested with 2015.8.13 and 2016.11.2
2017-02-03 13:59:01 -07:00
Thomas S Hatch
6a9704189f Merge pull request #39141 from UtahDave/fix_cache_lookup_ZD1187
Don't overwrite the minion_ids var that was passed
2017-02-03 13:56:24 -07:00
rallytime
8edfb82e90 Fix doc build errors in junos_syslog engine
- Moved the module-level Parser() call to the class level
- Added twisted imports to list of MOCK_MODULES
- Also added msgpack to handle some other errors
2017-02-03 11:59:47 -07:00
twangboy
dc1ccbed00 Add publisher_acl and publisher_acl_blacklist to defaults 2017-02-03 11:36:53 -07:00
rallytime
88cc195a2a Merge branch '2016.11' into 'develop'
No conflicts.
2017-02-03 10:58:55 -07:00
Nicole Thomas
d19cee716f Merge pull request #39164 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-02-03 10:57:06 -07:00
Ch3LL
90af696331 fix boto ec2 module create_image doc 2017-02-03 10:23:12 -07:00
Mike Place
0a8c7e451b Merge pull request #39148 from a-schuurman/feature/dockerng-module-ipv4
Added ipv4 arg to connect_container_to_network
2017-02-03 10:15:17 -07:00
Mike Place
fa525567cf Merge pull request #39150 from rallytime/python3-compat-fixes
Python 3 Test Fixes
2017-02-03 10:13:58 -07:00
Mike Place
ed12512045 Merge pull request #39152 from twangboy/win_installer
Remove files not needed by salt-minion
2017-02-03 10:11:10 -07:00
Jorge Schrauwen
387b10be25 zone state for Solaris 10/illumos (#39155)
* create zone state, zone.running, and zone.stopped

* renamed zone.running and zone.stopped, minor lint fixes

* cleanup message in zonecfg to make it clear for the zone state

* zone.property_present state

* zonecfg.set_property - should handle true/false parsed as boolean

* zonecfg module should be more consistant with message

* zone.property_absent implemented

* fix more minor issues in zonecfg when values get parsed as bool

* zonecfg fix spelling error

* improved zonecfg error message handling

* zonecfg parser should also do the reverse

* more improvements in zonecfg for parsing values

* small tweak to zonecfg simplyfy code for the zone state

* Add resource_present to zone state

* zonecfg lint fixes

* resource_absent state, lint fixed, test support

* zonecfg should be a bit more careful when removing the exported config

* zone.export state

* zone.import state

* zone.absent implemented

* zone.attached and zone.detached implemented

* very minor consistency fixes

* added zone.installed and zone.uninstalled, made zone.detached and zone.halted not fail on missing zone

* handle bool values in _parse_value

* add useful cleanup internal function to  zonecfg

* zonecfg - cleaned up _parse_value, added _sanitize_value and _dump_cfg for debugging

* zone.absent - uninstall would sometimes not do the right thing. some work on zone.present

* zone.present implemented path for when config does not yet exist

* zone.present supports updating properties

* zonecfg should support resources that do not have selectors

* zonecfg should also debug log remove_resource its config

* zone.present - implemented, after 2 refactors

* Finish documentation
2017-02-03 10:05:02 -07:00
Mike Place
cf548ac717 Remove unnecessary pass 2017-02-03 09:54:02 -07:00
Mike Place
4ebf7a3df4 Remove unnecessary pass statement 2017-02-03 09:53:08 -07:00
rallytime
6504bb6b02 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/pillar.py
  - salt/states/archive.py
  - tests/integration/states/archive.py
2017-02-03 09:48:58 -07:00
Mike Place
4b7e82f01f Merge pull request #39160 from nobourbakist/fix-usermod-args
[Bugfix] fix argument order for usermod call
2017-02-03 09:45:45 -07:00
Erik Johnson
9de08af950 Apply fix from #38705 to 2016.3 branch (#39077)
* Apply fix from #38705 to 2016.3 branch

This is a better fix and covers more use cases than the sudo_user one.

* Remove saltenv param from internal state func call

This was probably redundant in the first place, but since state.sls,
state.highstate, etc. accept a saltenv param and the actual state
functions do not, this results in multiple values passed for the saltenv
param.

Remove this argument and let file.get_managed reference __env__
internally.

* Update archive tests to match 2016.11 branch
2017-02-03 09:35:49 -07:00
Pablo Suárez Hernández
f950732fa0 pylint fixes 2017-02-03 16:28:42 +00:00
Daniel Wallace
da3053ea9b update vmware getting started doc (#39146)
The IDE entry needs to be a dictionary entry.  Without this, it is seen
as a string.  This is probably done this way so that in the future,
configurations can be added to the IDE device.
2017-02-03 09:00:00 -07:00
Pablo Suárez Hernández
aa2f9906e0 Removing extra spaces 2017-02-03 15:41:59 +00:00
Pablo Suárez Hernández
9d6a33f257 Adds 'snapper.create_config' unit tests 2017-02-03 15:41:58 +00:00
Pablo Suárez Hernández
d38ed505f8 Adds 'snapper.modify_snapshots' unit tests 2017-02-03 15:41:29 +00:00
Pablo Suárez Hernández
d5496ccc99 Adds 'snapper.delete_snapshots' unit tests 2017-02-03 15:41:29 +00:00
Pablo Suárez Hernández
3eecb6076b Snapper: Adding support for creating configurations 2017-02-03 15:41:29 +00:00
Pablo Suárez Hernández
041e54d42a Snapper: Adding support for snapshot metadata modification 2017-02-03 15:41:29 +00:00
Pablo Suárez Hernández
eaf5de9dce Snapper: Adding support for deleting snapshots 2017-02-03 15:41:28 +00:00
Frank Madro
699f302628 [Bugfix] fix argument order for usermod call
The argument order for the usermod -p call was reversed.
2017-02-03 15:26:34 +01:00
nicholasmhughes
a6a24e1a1b Addressed edge case when attempting to set the config file to 'Disabled'. The state should only check the file, since the in-memory setting won't disappear until after reboot. 2017-02-03 09:08:31 -05:00
Clint Armstrong
6a8046970e fix csr bugs and pep8 2017-02-03 08:30:24 -05:00
Clint Armstrong
36dcf5f3da only overwrite if overwrite option is specified 2017-02-03 08:07:18 -05:00
Clint Armstrong
403000d375 recreate cert on bad password 2017-02-03 07:58:48 -05:00
Clint Armstrong
6497094ba7 passphrase for crl 2017-02-03 07:55:16 -05:00
Clint Armstrong
3ef809fb0f passphrase for csr 2017-02-03 07:55:16 -05:00
Heghedus Razvan
a5553e6d44 linux_ip: Disable linux_ip for NILinuxRT systems
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
2017-02-03 14:25:09 +02:00
Heghedus Razvan
8408789511 Add network module for NILinuxRT: nilrt_ip.py
Connman is the network manager used as backend.
Functionalities:
  - ip.get_interface_details()
  - ip.up(interface)
  - ip.down(interface)
  - ip.set_dhcp_linklocal_all(interface)
  - ip.set_static_all(interface, address, netmask, gateway, domains)
  - ip.build_interface(interface, interface_type, enable, **settings)
  - ip.build_network_settings(**settings)
  - ip.get_network_settings()
  - ip.apply_network_settings(**settings)

Integration test for:
  - ip.enable
  - ip.disable
  - ip.set_dhcp_linklocal_all
  - ip.set_static_all

Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
2017-02-03 14:25:03 +02:00
rajvidhimar
dcef6759a5 Update rpc to display reply in different format as well as update docstring 2017-02-03 16:28:59 +05:30
nicholasmhughes
6858658cc2 The selinux.mode state only checked the current status of SELinux in memory (getenforce) when determining if changes
needed to be made. The /etc/selinux/config file could have a different value, and it would not be changed. This commit
enhances idempotency of the state in regards to both the in-memory and configuration file enforcement of SELinux.
2017-02-02 22:26:49 -05:00
twangboy
5ff8a14317 Fix problem deleting files 2017-02-02 18:12:18 -07:00
twangboy
4524dd49d4 Remove files not needed by salt-minion 2017-02-02 17:20:12 -07:00
Erik Johnson
08fb24f947 make helper function private 2017-02-02 18:06:51 -06:00
Erik Johnson
cdf045662f add debug logging for batch vars 2017-02-02 18:06:50 -06:00
Erik Johnson
316e62889a Don't fail test if data is empty
This keeps trimmed output from failing the test. We are still testing
with a specific module lower down in the test, so this doesn't reduce
our test coverage.
2017-02-02 18:06:50 -06:00
Erik Johnson
58e16a0d39 Account for trimmed value in 'salt -d' output 2017-02-02 18:06:50 -06:00
Erik Johnson
56e86a6e04 Run test_valid_docs in batches
This test fails often due to being trimmed, thanks to
salt.utils.dicttrim trimming values > max_event_size.

This commit changes this test so that it runs sys.doc twice, ensuring
that the return from sys.doc (for now) is not trimmed.
2017-02-02 18:06:50 -06:00
Erik Johnson
6221fd0573 Add tests for pillar decryption 2017-02-02 18:06:50 -06:00
garethgreenaway
e78ca0f575 Fixing a weird edge case when using salt syndics and targetting via pillar. Without this fix the master of masters ends up in an infinite loop since the data returned from the minions is differently structured than if a sync was not in use. (#39145) 2017-02-02 16:05:26 -07:00
lomeroe
8c0dc9162a correct issue when running get with return_not_configured=True (#39085)
lint indentation fixes
2017-02-02 16:04:42 -07:00
lomeroe
26eea61678 have _in_range_inclusive function attempt to convert a string to an int for the test (allow string based numbers to be verified to be in range). Specifically, this allows the CachedLogonsCount policy to be set (stored in the registry as a REG_SZ and specified as a string number when passed to the module) (#39086) 2017-02-02 16:03:44 -07:00
rallytime
4595f81685 [PY3] Sort return data and mock data for testing stability 2017-02-02 22:56:00 +00:00