From 8a4ad635ec106e924619ba54859c8e254e16e83b Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 19 Nov 2020 13:35:36 -0700 Subject: [PATCH] Ansible-runner is failing when passing host to display Ansible-runner is using their own custom call back and it appears to be failing when actually set to a non-string. Check to make sure host is a string or just unset it if it isn't a string value. Change-Id: Ib67b6bd69ed1c3f9fcd32552b6599cbe4ff478ce Closes-Bug: #1904917 (cherry picked from commit e737f3bfd4d3e98034d805e22e25a8bfb17d9c14) --- tripleo_ansible/ansible_plugins/strategy/tripleo_base.py | 3 +++ tripleo_ansible/ansible_plugins/strategy/tripleo_free.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tripleo_ansible/ansible_plugins/strategy/tripleo_base.py b/tripleo_ansible/ansible_plugins/strategy/tripleo_base.py index 5fbc932c3..004ddf090 100644 --- a/tripleo_ansible/ansible_plugins/strategy/tripleo_base.py +++ b/tripleo_ansible/ansible_plugins/strategy/tripleo_base.py @@ -51,6 +51,9 @@ class TripleoBase(StrategyBase): self._has_hosts_cache_all = False def _print(self, msg, host=None, level=1): + # host needs to be a string or bad things happen. LP#1904917 + if host and not isinstance(host, str): + host = None display.verbose(msg, host=host, caplevel=level) def _debug(self, msg, host=None): diff --git a/tripleo_ansible/ansible_plugins/strategy/tripleo_free.py b/tripleo_ansible/ansible_plugins/strategy/tripleo_free.py index 937369582..366f74fbd 100644 --- a/tripleo_ansible/ansible_plugins/strategy/tripleo_free.py +++ b/tripleo_ansible/ansible_plugins/strategy/tripleo_free.py @@ -147,7 +147,7 @@ class StrategyModule(BASE.TripleoBase): def _advance_host(self, host, task): """Advance the host's task as necessary""" - self._debug('_advance_host {}'.format(host), host) + self._debug('_advance_host {}'.format(host)) host_name = host.get_name() # build get_vars call params