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

Merge pull request #4881 from ryanpetrello/cli-ssh-example

Browse Source 
cli: warn users if they specify a missing file with @

Reviewed-by: Yanis Guenane
             https://github.com/Spredzy
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-10-02 15:00:51 +00:00
committed by GitHub
parent 1f62d223a2 6c1488ed00
commit a9b299cd98
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awxkit/awxkit/cli/docs/source/examples.rst
View File

@@ -57,5 +57,5 @@ Importing an SSH Key
awx credentials create --credential_type 'Machine' \ awx credentials create --credential_type 'Machine' \
--name 'My SSH Key' --user 'alice' \ --name 'My SSH Key' --user 'alice' \
--inputs "{'username': 'server-login', 'ssh_key_data': '@~/.ssh/id_rsa`}" --inputs '{"username": "server-login", "ssh_key_data": "@~/.ssh/id_rsa"}'

3
awxkit/awxkit/cli/options.py
View File

@@ -165,8 +165,7 @@ class ResourceOptionsParser(object):
# (to make things like SSH key data easier to work with) # (to make things like SSH key data easier to work with)
if isinstance(v, six.text_type) and v.startswith('@'): if isinstance(v, six.text_type) and v.startswith('@'):
path = os.path.expanduser(v[1:]) path = os.path.expanduser(v[1:])
if os.path.exists(path): parsed[k] = open(path).read()
parsed[k] = open(path).read()
return parsed return parsed