Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

'try' in case its a v2 tower which doesn't have v3 attr #17

Merged
merged 1 commit into from
Jul 24, 2017
Merged

'try' in case its a v2 tower which doesn't have v3 attr #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/manageiq/providers/ansible_tower/shared/inventory/parser/automation_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def credentials
else "#{provider_module}::AutomationManager::Credential"
end
inventory_object.options = inventory_object.type.constantize::EXTRA_ATTRIBUTES.keys.each_with_object({}) do |k, h|
h[k] = credential.public_send(k)
h[k] = credential.try(k)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/vcr_cassettes/manageiq/providers/ansible_tower/automation_manager/refresher_v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9529,7 +9529,7 @@ http_interactions:
"", "last_name": ""}}, "created": "2015-12-17T16:55:29.495Z", "modified":
"2015-12-17T21:27:48.511Z", "name": "Openstack", "description": "RHOS in NC",
"user": 2, "team": null, "kind": "openstack", "cloud": true, "host": "http://10.8.96.4:5000/v2.0",
"username": "admin", "password": "$encrypted$", "security_token": "", "domain": "d.com", "project":
"username": "admin", "password": "$encrypted$", "security_token": "", "project":
"admin", "ssh_key_data": "", "ssh_key_unlock": "", "become_method": "", "become_username":
"", "become_password": "", "vault_password": ""}, {"id": 3, "type": "credential",
"url": "/api/v1/credentials/3/", "related": {"created_by": "/api/v1/users/1/",
Expand Down