Skip to content

Commit

Permalink
Merge pull request #4659 from bcoca/nicer_error
Browse files Browse the repository at this point in the history
better error message on missing runner

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
  • Loading branch information
softwarefactory-project-zuul[bot] authored Sep 26, 2019
2 parents 0f42782 + 9d48ba4 commit 693e588
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions awx/plugins/isolated/awx_capacity.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.

from ansible.module_utils._text import to_text
from ansible.module_utils.basic import AnsibleModule

import subprocess
Expand Down Expand Up @@ -48,13 +49,16 @@ def main():
module = AnsibleModule(
argument_spec = dict()
)

ar = module.get_bin_path('ansible-runner', required=True)

try:
version = subprocess.check_output(
['ansible-runner', '--version'],
[ar, '--version'],
stderr=subprocess.STDOUT
).strip()
except subprocess.CalledProcessError as e:
module.fail_json(msg=str(e))
module.fail_json(msg=to_text(e))
return
# NOTE: Duplicated with awx.main.utils.common capacity utilities
cpu, capacity_cpu = get_cpu_capacity()
Expand Down

0 comments on commit 693e588

Please sign in to comment.