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

SSPI support #223

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SSPI support #223

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
5 changes: 2 additions & 3 deletions lib/vSphere/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,13 @@ def custom_attribute(key, value)
def validate(machine)
errors = _detected_errors

if password == :ask || password.nil?
if password == :ask
self.password = machine.ui.ask('vSphere Password (will be hidden): ', echo: false)
end

# TODO: add blank?
errors << I18n.t('vsphere.config.host') if host.nil?
errors << I18n.t('vsphere.config.user') if user.nil?
errors << I18n.t('vsphere.config.password') if password.nil?
errors << I18n.t('vsphere.config.user') if user.nil? && !password.nil?
errors << I18n.t('vsphere.config.template') if template_name.nil?

# Only required if we're cloning from an actual template
Expand Down
2 changes: 1 addition & 1 deletion vSphere.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Gem::Specification.new do |s|
s.add_dependency 'nokogiri', '~>1.5'
# force the use of at least rbvmomi 1.8.2 to work around concurrency errors:
# https://github.com/nsidc/vagrant-vsphere/issues/139
s.add_dependency 'rbvmomi', '>=1.8.2', '<2.0.0'
s.add_dependency 'rbvmomi', '>=1.9.0', '<2.0.0'
s.add_dependency 'i18n', '>= 0.6.4', '< 0.8.0'

s.add_development_dependency 'rake'
Expand Down