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

Backport? (copy) the applicable parts of "New Tower credential types" #15598

Merged
merged 1 commit into from
Jul 19, 2017
Merged

Backport? (copy) the applicable parts of "New Tower credential types" #15598

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
4 changes: 2 additions & 2 deletions app/models/manageiq/providers/embedded_ansible/automation_manager/azure_credential.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This corresponds to Ansible Tower's Azure Resource Manager (azure_rm) type credential. We are not modeling the deprecated Azure classic
class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::AzureCredential <
ManageIQ::Providers::EmbeddedAnsible::AutomationManager::CloudCredential
class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::AzureCredential < ManageIQ::Providers::EmbeddedAnsible::AutomationManager::CloudCredential
include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::AzureCredential
end
1 change: 1 addition & 0 deletions app/models/manageiq/providers/embedded_ansible/automation_manager/google_credential.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::GoogleCredential < ManageIQ::Providers::EmbeddedAnsible::AutomationManager::CloudCredential
include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::GoogleCredential
end
4 changes: 2 additions & 2 deletions app/models/manageiq/providers/embedded_ansible/automation_manager/network_credential.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::NetworkCredential <
ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Credential
class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::NetworkCredential < ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Credential
include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::NetworkCredential
end
1 change: 1 addition & 0 deletions app/models/manageiq/providers/embedded_ansible/automation_manager/openstack_credential.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::OpenstackCredential < ManageIQ::Providers::EmbeddedAnsible::AutomationManager::CloudCredential
include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::OpenstackCredential
end
1 change: 1 addition & 0 deletions app/models/manageiq/providers/embedded_ansible/automation_manager/rackspace_credential.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::RackspaceCredential < ManageIQ::Providers::EmbeddedAnsible::AutomationManager::CloudCredential
include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::RackspaceCredential
end
1 change: 1 addition & 0 deletions app/models/manageiq/providers/embedded_ansible/automation_manager/satellite6_credential.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Satellite6Credential < ManageIQ::Providers::EmbeddedAnsible::AutomationManager::CloudCredential
include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::Satellite6Credential
end
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": "", "project":
"username": "admin", "password": "$encrypted$", "security_token": "", "domain": "d.com", "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