[bp-2.12] hostname - fix TypeError in FileStrategy (#77365)

* Use file_get_content() to read the file containing the host name

(cherry picked from commit d60efd9768)

Signed-off-by: Emmanuel Benoît <tseeker@nocternity.net>
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>

Co-authored-by: Emmanuel Benoît <tseeker@nocternity.net>
pull/77543/head
Abhijeet Kasurde 4 years ago committed by GitHub
parent 8bbcfebd5c
commit 2ce5d99e83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- hostname - use ``file_get_content()`` to read the file containing the host name in the ``FileStrategy.get_permanent_hostname()`` method. This prevents a ``TypeError`` from being raised when the strategy is used (https://github.com/ansible/ansible/issues/77025).

@ -78,7 +78,7 @@ from ansible.module_utils.basic import (
)
from ansible.module_utils.common.sys_info import get_platform_subclass
from ansible.module_utils.facts.system.service_mgr import ServiceMgrFactCollector
from ansible.module_utils.facts.utils import get_file_lines
from ansible.module_utils.facts.utils import get_file_lines, get_file_content
from ansible.module_utils._text import to_native, to_text
from ansible.module_utils.six import PY3, text_type
@ -257,7 +257,7 @@ class FileStrategy(BaseStrategy):
return ''
try:
return get_file_lines(self.FILE)
return get_file_content(self.FILE, default='', strip=True)
except Exception as e:
self.module.fail_json(
msg="failed to read hostname: %s" % to_native(e),

Loading…
Cancel
Save