etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2457 from HiagData/CLOUDSTACK-10295 

CLOUDSTACK-10295 Marvin: add support for password-enabled templates
This commit is contained in:
Rafael Weingärtner 2018-02-22 19:41:39 -03:00 committed by GitHub
parent e9da30b24e eeba3e4853
commit 06c2948c65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/marvin/marvin/lib/base.py
View File

@ -593,6 +593,10 @@ class VirtualMachine:
virtual_machine = apiclient.deployVirtualMachine(cmd, method=method)
if 'password' in virtual_machine.__dict__.keys():
if virtual_machine.password:
services['password'] = virtual_machine.password
virtual_machine.ssh_ip = virtual_machine.nic[0].ipaddress
if startvm is False:
virtual_machine.public_ip = virtual_machine.nic[0].ipaddress