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

[V2V] Add default credentials to ansible_playbook method #18724

Merged
merged 11 commits into from
May 7, 2019
Merged

[V2V] Add default credentials to ansible_playbook method #18724

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1840f6c
Add default credentials if authentication not directly associated wit…
May 3, 2019
cee75fb
Fixed error message handler in find_credentials.
May 3, 2019
6b22c60
Modify find_credentials so that it accepts an auth_type, and update t…
May 6, 2019
f4607f2
Explicitly pass auth_type argument to find_credentials.
May 6, 2019
aa3cde8
Fix stray pipe char.
May 6, 2019
24b2b45
Remove useless ||
djberg96 May 7, 2019
b7aa651
Simplify the find_credentials method a bit.
May 7, 2019
4e89c38
Default to v2v auth_type for find_credentials.
May 7, 2019
3ba0ca8
Check for explicit authentication types instead of just defaulting to…
May 7, 2019
d2cc525
Don't default on first auth type check.
May 7, 2019
802a13b
Update comments for find_credentials.
May 7, 2019
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
27 changes: 15 additions & 12 deletions app/models/conversion_host.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,20 +241,23 @@ def resource_supports_conversion_host
end

# Find the credentials for the associated resource. By default it will
# look for a v2v auth type. If that is not found, it will look for the
# authentication associated with the resource using ssh_keypair or default,
# in that order, as the authtype.
# look for a v2v auth type if no argument is passed in.
#
def find_credentials(msg = nil)
authentication = authentication_type('v2v') ||
resource.authentication_type('ssh_keypair') ||
resource.authentication_type('default')
# If one isn't found, then it will look for the authentication associated
# with the resource using the 'ssh_keypair' auth type, and finally 'default'.
#
def find_credentials(auth_type = 'v2v')
authentication = authentication_type(auth_type)

if authentication.blank?
res = resource.respond_to?(:authentication_type) ? resource : resource.ext_management_system
authentication = res.authentication_type('ssh_keypair') || res.authentication_type('default')
end

unless authentication
msg = "Credentials not found for conversion host #{name} or resource #{resource.name}"
msg << " #{msg}" if msg
_log.error(msg)
raise MiqException::Error, msg
error_msg = "Credentials not found for conversion host #{name} or resource #{resource.name}"
_log.error(error_msg)
raise MiqException::Error, error_msg
agrare marked this conversation as resolved.
Show resolved Hide resolved
end

authentication
Expand Down Expand Up @@ -311,7 +314,7 @@ def ansible_playbook(playbook, extra_vars = {}, miq_task_id = nil, auth_type = n

command = "ansible-playbook #{playbook} --inventory #{host}, --become --extra-vars=\"ansible_ssh_common_args='-o StrictHostKeyChecking=no'\""

auth = authentication_type(auth_type) || authentications.first
auth = find_credentials(auth_type)
command << " --user #{auth.userid}"

case auth
Expand Down