External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-11 06:29:31 -02:30
Code Issues Packages Projects Releases Wiki Activity

prevent awx -h CLI command from printing a scary connection error

Browse Source
This commit is contained in:
Ryan Petrello
2019-08-15 13:21:46 -04:00
parent 099a7f6cde
commit 94235f4736
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awxkit/awxkit/cli/client.py
View File

@@ -3,6 +3,8 @@ import os
import pkg_resources import pkg_resources
import sys import sys
from requests.exceptions import RequestException
from .custom import handle_custom_actions from .custom import handle_custom_actions
from .format import (add_authentication_arguments, from .format import (add_authentication_arguments,
add_output_formatting_arguments, add_output_formatting_arguments,
@@ -112,7 +114,17 @@ class CLI(object):
# ...otherwise, set up a awxkit connection because we're # ...otherwise, set up a awxkit connection because we're
# likely about to do some requests to /api/v2/ # likely about to do some requests to /api/v2/
self.root = api.Api() self.root = api.Api()
self.fetch_version_root() try:
self.fetch_version_root()
except RequestException:
# If we can't reach the API root (this usually means that the
# hostname is wrong, or the credentials are wrong)
if self.help:
# ...but the user specified -h...
known, unknown = self.parser.parse_known_args(self.argv)
if len(unknown) == 1 and os.path.basename(unknown[0]) == 'awx':
return
raise
def fetch_version_root(self): def fetch_version_root(self):
self.v2 = self.root.get().available_versions.v2.get() self.v2 = self.root.get().available_versions.v2.get()