mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
[PR #6923/7020b27b backport][stable-6] cobbler inventory plugin: Convert unicode to str (#6952)
cobbler inventory plugin: Convert unicode to str (#6923)
* plugins/inventory/cobbler: Convert unicode to str
* plugins/inventory/cobbler: Use text_type instead
(cherry picked from commit 7020b27b0a
)
Co-authored-by: Algirdas <76789112+Algirdas-Z@users.noreply.github.com>
This commit is contained in:
parent
a4e1beefe3
commit
b104c580e1
2 changed files with 4 additions and 1 deletions
2
changelogs/fragments/6923-cobbler-inventory_unicode.yml
Normal file
2
changelogs/fragments/6923-cobbler-inventory_unicode.yml
Normal 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).
|
|
@ -87,6 +87,7 @@ from ansible.errors import AnsibleError
|
|||
from ansible.module_utils.common.text.converters import to_text
|
||||
from ansible.module_utils.six import iteritems
|
||||
from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, to_safe_group_name
|
||||
from ansible.module_utils.six import text_type
|
||||
|
||||
# xmlrpc
|
||||
try:
|
||||
|
@ -128,7 +129,7 @@ class InventoryModule(BaseInventoryPlugin, Cacheable):
|
|||
self.connection = xmlrpc_client.Server(self.cobbler_url, allow_none=True)
|
||||
self.token = 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
|
||||
|
||||
def _init_cache(self):
|
||||
|
|
Loading…
Reference in a new issue