Add support to pvc 131 and 132

Add support to pvc 131 and 132

Change-Id: I752f53f9d8abebab0de86890edd70b17d30b0297
Closes-Bug: #1643787
This commit is contained in:
Jerry Cai 2016-11-22 15:41:12 +08:00
parent 444dfcca9a
commit 27b8e9db04
3 changed files with 4 additions and 4 deletions

View File

@ -246,8 +246,8 @@ class PVCServerManager(servers.ServerManager):
body["server"]["flavor"]['extra_specs'] = flavor['extra_specs']
# If hypervisor ID specified:
if kwargs.get("hypervisor", None):
body["server"]['hypervisor_hostname'] = kwargs["hypervisor"]
#if kwargs.get("hypervisor", None):
# body["server"]['hypervisor_hostname'] = kwargs["hypervisor"]
if userdata:
# RTC/172018 -- start

View File

@ -992,7 +992,7 @@ class PowerVCCloudManager(manager.Manager):
"PowerVC flavor"
" that fits "
"into the resource "
"instance instead"), rtn)
"instance instead"))
break
except Exception:
if rtn is None:

View File

@ -899,7 +899,7 @@ class PowerVCService(object):
flavor_props = {'vcpus': flavor['vcpus'],
'ram': flavor['memory_mb'],
'disk': flavor['root_gb'],
'disk': getattr(server, 'root_gb', flavor['root_gb']),
'extra_specs': flavor_extras_target
}