mirror of
https://github.com/puppetlabs/vmpooler-provider-vsphere.git
synced 2026-01-26 03:18:41 -05:00
Use domain provided by pool's dns_config
This commit is contained in:
parent
daa49dd1c9
commit
130736fa9d
1 changed files with 7 additions and 1 deletions
|
|
@ -51,6 +51,11 @@ module Vmpooler
|
||||||
'vsphere'
|
'vsphere'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def domain(pool_name)
|
||||||
|
dns_plugin_name = pool_config(pool_name)['dns_plugin']
|
||||||
|
return dns_config(dns_plugin_name)
|
||||||
|
end
|
||||||
|
|
||||||
def folder_configured?(folder_title, base_folder, configured_folders, allowlist)
|
def folder_configured?(folder_title, base_folder, configured_folders, allowlist)
|
||||||
return true if allowlist&.include?(folder_title)
|
return true if allowlist&.include?(folder_title)
|
||||||
return false unless configured_folders.keys.include?(folder_title)
|
return false unless configured_folders.keys.include?(folder_title)
|
||||||
|
|
@ -565,7 +570,8 @@ module Vmpooler
|
||||||
|
|
||||||
def vm_ready?(_pool_name, vm_name)
|
def vm_ready?(_pool_name, vm_name)
|
||||||
begin
|
begin
|
||||||
open_socket(vm_name, global_config[:config]['domain'])
|
domain = domain(_pool_name)
|
||||||
|
open_socket(vm_name, domain)
|
||||||
rescue StandardError => _e
|
rescue StandardError => _e
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue