[fluorine] Merge forward from 2018.3 to fluorine #50868
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This keeps us from needing to manually clean them up in the tearDown
On the road to saltstack#32245.
2018-12-06 11:57:11,495 [salt.utils.gitfs :2341][ERROR ][866] Exception caught while fetching gitfs remote '__env__ https://git.example.org/somerepo.git': 'ascii' codec can't decode byte 0xc3 in position 0: ordinal not in range(128) Traceback (most recent call last): File "/usr/lib/python2.7/dist-packages/salt/utils/gitfs.py", line 2329, in fetch_remotes if repo.fetch(): File "/usr/lib/python2.7/dist-packages/salt/utils/gitfs.py", line 757, in fetch return self._fetch() File "/usr/lib/python2.7/dist-packages/salt/utils/gitfs.py", line 1271, in _fetch cleaned = self.clean_stale_refs() File "/usr/lib/python2.7/dist-packages/salt/utils/gitfs.py", line 605, in clean_stale_refs if line.startswith(marker): UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 0: ordinal not in range(128) The environement variables are not sanitized, and as we use LANG=fr_FR.utf8. Calling the same command prints non-ascii: root@salt-master:/var/cache/salt/master/git_pillar/51958f355141ebce331e186a5230c20f2d0264025054eeb2fc2c5b3b81ab53a0# git remote prune origin Élimination de origin URL : https://git.example.org/somerepo.git * [éliminé] origin/toto Inspired by https://github.com/gitpython-developers/GitPython/blob/a8591a094a768d73e6efb5a698f74d354c989291/git/cmd.py#L694
The _changes method was not properlt reporting mindays, maxdays, inactdays and warndays values
Conflicts: - salt/templates/debian_ip/debian_eth.jinja
- Updated debian-based distro comment - Fixed example of configuring a loopback device - Cleaned up copy/paste mistakes - Added more examples - Verified examples work on Debian 9
Back-port saltstack#49355 to 2018.3
Fix saltstack#48801 min, max, inact, and warn changes
git_pillar: Add support for all_saltenvs parameter
Update a couple test modules to use with_tempdir/with_tempfile decorators
Fix icinga2 cert path
Adds more policies Fixes bug in netsh salt util Uses __context__ to speed things up Fixes bug in the state where it was reporting changes when no changes occurred
Add netsh mechanism in the LGPO module
Adding git 'v' to the bootstrap options
salt.modules.mysql: Decode fetch results before making string comparisons
Fix py3 issues in win_lgpo_netsh Make the state case insensitive for policy lookups
Check file_mode in file.directory and _check_directory
If the `pyvmomi` library is missing, all tests from the
tests.unit.modules.RemoveCapacityFromDiskgroupTestCase will fail:
```
ERROR: test__get_proxy_target_call
(unit.modules.test_vsphere.RemoveCapacityFromDiskgroupTestCase)
[CPU:0.0%|MEM:35.1%]
----------------------------------------------------------------------
Traceback (most recent call last):
File "salt/utils/vmware.py", line 485, in disconnect
Disconnect(service_instance)
NameError: name 'Disconnect' is not defined
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "salt/modules/vsphere.py", line 381, in _gets_service_instance_via_proxy
salt.utils.vmware.disconnect(local_service_instance)
File "salt/utils/vmware.py", line 486, in disconnect
except vim.fault.NoPermission as exc:
NameError: name 'vim' is not defined
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "salt/utils/vmware.py", line 485, in disconnect
Disconnect(service_instance)
NameError: name 'Disconnect' is not defined
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "tests/unit/modules/test_vsphere.py", line 1568, in test__get_proxy_target_call
capacity_disk_ids=['fake_disk1', 'fake_disk2'])
File "salt/modules/vsphere.py", line 295, in __supports_proxies
return fn(*args, **salt.utils.args.clean_kwargs(**kwargs))
File "salt/modules/vsphere.py", line 386, in _gets_service_instance_via_proxy
salt.utils.vmware.disconnect(local_service_instance)
File "/home/bdrung/projects/salt/debian/salt/utils/vmware.py", line 486, in disconnect
except vim.fault.NoPermission as exc:
NameError: name 'vim' is not defined
```
Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
Fix UnicodeDecodeError in ps module
Fix RemoveCapacityFromDiskgroupTestCase require pyvmomi
Fix issues with lgpo state and util
…ring the file is read & written in binary mode.
…key_cache_file_binary [2018.3] Fixes for key_cache and python3
Conflicts: - salt/templates/debian_ip/debian_eth.jinja
garethgreenaway
approved these changes
Dec 14, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conflicts: