shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00
Code Releases Wiki Activity

M #-: fix provision minor bug (#685)

Browse Source
This commit is contained in:
Alejandro Huertas Herrero 2021-01-21 12:40:50 +01:00 committed by GitHub
parent e08ad357f6
commit 35b46e4fa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/oneprovision/lib/provision/provision.rb
View File

@ -317,7 +317,7 @@ module OneProvision
end
if skip == :none
configure
configure_resources
else
info_objects('hosts', true) {|h| h.enable }
end
@ -351,19 +351,7 @@ module OneProvision
return OpenNebula::Error.new('Provision already configured')
end
self.state = STATE['CONFIGURING']
update
rc = Ansible.configure(hosts, datastores, self)
if rc == 0
self.state = STATE['RUNNING']
else
self.state = STATE['ERROR']
end
update
configure_resources
end
# Deletes provision objects
@ -371,6 +359,8 @@ module OneProvision
# @param cleanup [Boolean] True to delete running VMs and images
# @param timeout [Integer] Timeout for deleting running VMs
def delete(cleanup, timeout)
exist = true
if running_vms? && !cleanup
Utils.fail('Provision with running VMs can\'t be deleted')
end
@ -416,9 +406,13 @@ module OneProvision
rc = super()
exist = false
return rc if OpenNebula.is_error?(rc)
0
ensure
unlock if exist
end
# Updates provision objects
@ -691,6 +685,23 @@ module OneProvision
end
end
# Configures provision resources
def configure_resources
self.state = STATE['CONFIGURING']
update
rc = Ansible.configure(hosts, datastores, self)
if rc == 0
self.state = STATE['RUNNING']
else
self.state = STATE['ERROR']
end
update
end
# Updates provision hosts with new name
#
# @param ips [Array] IPs for each host