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.

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

Drop support for oVirt /api, always use /ovirt-engine/api #14469

Merged
merged 1 commit into from
Apr 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,12 @@ def connect(options = {})
raise "version #{version} of the api is not supported by the provider"
end

# If the API path is stored in the endpoints table then use it:
path = options[:path] || default_endpoint.path
_log.info("Using stored API path '#{path}'.") unless path.blank?

# Prepare the options to call the method that creates the actual connection:
connect_options = {
:scheme => options[:scheme] || 'https',
:server => options[:ip] || address,
:port => options[:port] || port,
:path => path,
:path => options[:path] || '/ovirt-engine/api',
:username => options[:user] || authentication_userid(options[:auth_type]),
:password => options[:pass] || authentication_password(options[:auth_type]),
:service => options[:service] || "Service",
Expand All @@ -56,7 +52,7 @@ def connect(options = {})
connection = self.class.public_send(connect_method, connect_options)

# Copy the API path to the endpoints table:
default_endpoint.path = version.to_i == 4 ? '/ovirt-engine/api' : connection.api_path
default_endpoint.path = connect_options[:path]

connection
end
Expand Down

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading