openstack
/
nova
Code Issues Proposed changes

Merge "VMware: use vCenter instead of VC"

This commit is contained in:
Jenkins 2015-06-11 09:58:24 +00:00 committed by Gerrit Code Review
parent 3614dac9bf 5a058a125a
commit abbfdee17d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nova/virt/vmwareapi/driver.py
View File

@ -48,15 +48,15 @@ LOG = logging.getLogger(__name__)
vmwareapi_opts = [ vmwareapi_opts = [
cfg.StrOpt('host_ip', cfg.StrOpt('host_ip',
help='Hostname or IP address for connection to VMware VC ' help='Hostname or IP address for connection to VMware '
'host.'), 'vCenter host.'),
cfg.IntOpt('host_port', cfg.IntOpt('host_port',
default=443, default=443,
help='Port for connection to VMware VC host.'), help='Port for connection to VMware vCenter host.'),
cfg.StrOpt('host_username', cfg.StrOpt('host_username',
help='Username for connection to VMware VC host.'), help='Username for connection to VMware vCenter host.'),
cfg.StrOpt('host_password', cfg.StrOpt('host_password',
help='Password for connection to VMware VC host.', help='Password for connection to VMware vCenter host.',
secret=True), secret=True),
cfg.MultiStrOpt('cluster_name', cfg.MultiStrOpt('cluster_name',
help='Name of a VMware Cluster ComputeResource.'), help='Name of a VMware Cluster ComputeResource.'),
@ -205,13 +205,13 @@ class VMwareVCDriver(driver.ComputeDriver):
def _check_min_version(self): def _check_min_version(self):
min_version = utils.convert_version_to_int(constants.MIN_VC_VERSION) min_version = utils.convert_version_to_int(constants.MIN_VC_VERSION)
vc_version = vim_util.get_vc_version(self._session) vc_version = vim_util.get_vc_version(self._session)
LOG.info(_LI("VMware VC version: %s"), vc_version) LOG.info(_LI("VMware vCenter version: %s"), vc_version)
if min_version > utils.convert_version_to_int(vc_version): if min_version > utils.convert_version_to_int(vc_version):
# TODO(garyk): enforce this from M # TODO(garyk): enforce this from M
LOG.warning(_LW('Running Nova with a VMware VC version less than ' LOG.warning(_LW('Running Nova with a VMware vCenter version less '
'%(version)s is deprecated. The required minimum ' 'than %(version)s is deprecated. The required '
'version of VC will be raised to %(version)s ' 'minimum version of vCenter will be raised to '
'in the 2016.1 release.'), '%(version)s in the 2016.1 release.'),
{'version': constants.MIN_VC_VERSION}) {'version': constants.MIN_VC_VERSION})
@property @property