ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

cobbler inventory plugin: Convert unicode to str (#6923)

Browse source 
* plugins/inventory/cobbler: Convert unicode to str

* plugins/inventory/cobbler: Use text_type instead
This commit is contained in:
Algirdas 2023-07-16 11:58:30 +03:00 committed by GitHub
parent b818afd464
commit 7020b27b0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/6923-cobbler-inventory_unicode.yml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- cobbler inventory plugin - convert Ansible unicode strings to native Python unicode strings before passing user/password to XMLRPC client (https://github.com/ansible-collections/community.general/pull/6923).

3
plugins/inventory/cobbler.py
View file

@ -104,6 +104,7 @@ import socket
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.common.text.converters import to_text
from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, to_safe_group_name from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, to_safe_group_name
from ansible.module_utils.six import text_type
# xmlrpc # xmlrpc
try: try:
@ -145,7 +146,7 @@ class InventoryModule(BaseInventoryPlugin, Cacheable):
self.connection = xmlrpc_client.Server(self.cobbler_url, allow_none=True) self.connection = xmlrpc_client.Server(self.cobbler_url, allow_none=True)
self.token = None self.token = None
if self.get_option('user') is not None: if self.get_option('user') is not None:
self.token = self.connection.login(self.get_option('user'), self.get_option('password')) self.token = self.connection.login(text_type(self.get_option('user')), text_type(self.get_option('password')))
return self.connection return self.connection
def _init_cache(self): def _init_cache(self):