Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2019.2] Merge forward from 2018.3 to 2019.2 #51984

Merged
merged 59 commits into from Mar 7, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Mar 5, 2019

Conflicts:

  • doc/conf.py
  • salt/modules/win_system.py
  • salt/states/boto3_route53.py
martin-paulus and others added 30 commits Feb 5, 2019
…idate-ALIAS-A-records
… using openssl 1.1.1-1.
…t-key to break.
… use the defaults.
…ster_openssl

[2017.7] Removing unused salt.crypt imports
Backport 51471
[2017.7] Fix ruby gems tests, again
[2018.3.4] Fix ruby gems tests, again
[2017.7] Add initial nox configuration. Tell `tox`'ers to use `nox`'.
…3.py-fails-to-validate-ALIAS-A-records

51501 states boto3 route53.py fails to validate alias a records
[2018.3] Merge forward from 2017.7 to 2018.3
Update release versions for the 2018.3 branch
As documented the drive should be designated as C:\\. A recent PR 50188
changed the behavior to work with C:\, which was causing the documented
syntax to fail.

This change allows either syntax C:\ or C:\\
twangboy and others added 22 commits Feb 27, 2019
Gate zfs grain on Windows
Some code in salt._compat which checks if the value is a packed binary
representation of an IPv6 address fails if the value passed is not a
bytestring (i.e. a `unicode` type on PY2 or `str` type on PY3). This
fixes that code when the minion ID is a 16-character string (not a
bytestring). Note that the minion ID will never be a bytestring as of
2018.3.0, so this affects any 16-character minion ID when the minion ID
is checked to see if it is really an IP address.
Backport both #51298 and #51342
Update release documentation
[2018.3] Merge forward from 2018.3.4 to 2018.3
Add zabbix to the Windows builds
Use winapi.com instead of coinitialize
Fix diskusage beacon on Windows
Add 2018.3.5 release notes
[2018.3] Nox fixes
Conflicts:
  - doc/conf.py
  - salt/modules/win_system.py
  - salt/states/boto3_route53.py
@Ch3LL Ch3LL requested a review from saltstack/team-core as a code owner Mar 5, 2019
@Ch3LL Ch3LL merged commit 7af4f5c into saltstack:2019.2 Mar 7, 2019
9 checks passed
9 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
@Ch3LL Ch3LL deleted the Ch3LL:merge-2019.2 branch Mar 14, 2019
@rares-pop

This comment has been minimized.

Copy link
Contributor

commented on salt/modules/win_system.py in a38300b Jul 11, 2019

@twangboy - does these things work?

Once you get out of the context of with salt.utils.winapi.Com(), is conn still valid, because it will in the Com class, on the exit method (which happens when you get out of the with block), you do a pythoncom.CoUninitialize().

I think once you add the with context, you should put everything inside (returns too).

And BTW, I do see these traces on a machine box:
File "C:\Program Files\National Instruments\Shared\salt-minion\bin\lib\site-packages\salt\modules\win_system.py", line 569, in get_computer_desc
desc = get_system_info()['description']
File "C:\Program Files\National Instruments\Shared\salt-minion\bin\lib\site-packages\salt\modules\win_system.py", line 520, in get_system_info
system = conn.Win32_OperatingSystem()[0]
File "C:\Program Files\National Instruments\Shared\salt-minion\bin\lib\site-packages\wmi.py", line 1147, in getattr
return getattr (self._namespace, attribute)
File "C:\Program Files\National Instruments\Shared\salt-minion\bin\lib\site-packages\win32com\client\dynamic.py", line 527, in getattr
raise AttributeError("%s.%s" % (self.username, attr))
AttributeError: winmgmts:.Win32_OperatingSystem
2019-07-11 13:40:00,791 [salt.loader :791 ][CRITICAL][11628] Failed to load grains defined in grain file nisysmgmt.nisysmgmt_data in function <function nisysmgmt_data at 0x00000104AAD37158>, error:
Traceback (most recent call last):
File "C:\Program Files\National Instruments\Shared\salt-minion\bin\lib\site-packages\wmi.py", line 1145, in getattr
return self._cached_classes (attribute)
File "C:\Program Files\National Instruments\Shared\salt-minion\bin\lib\site-packages\wmi.py", line 1156, in _cached_classes
self._classes_map[class_name] = _wmi_class (self, self._namespace.Get (class_name))
File "", line 3, in Get
File "C:\Program Files\National Instruments\Shared\salt-minion\bin\lib\site-packages\win32com\client\dynamic.py", line 287, in ApplyTypes
result = self.oleobj.InvokeTypes(*(dispid, LCID, wFlags, retType, argTypes) + args)
pywintypes.com_error: (-2147352567, 'Exception occurred.', (0, 'SWbemServicesEx', None, None, 0, -2147417848), None)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
9 participants
You can’t perform that action at this time.