From e498373b26d3fa05274429bcf958ea86eb4e3af2 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Tue, 18 Feb 2014 12:59:41 -0500 Subject: [PATCH] Fixing host_ip configuration help message The vCenter/ESXi client can only accept a hostname or IP address and not a URL. Fix the help message to accurately describe what kind of address is accepted. Change-Id: Ie90247195181189d22e727a855145313397550ca Closes-Bug: #1274294 --- etc/nova/nova.conf.sample | 3 ++- nova/virt/vmwareapi/driver.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index c0311aa8879a..ab2b338c40d5 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -3306,7 +3306,8 @@ # Options defined in nova.virt.vmwareapi.driver # -# URL for connection to VMware ESX/VC host. (string value) +# Hostname or IP address for connection to VMware ESX/VC host. +# (string value) #host_ip= # Username for connection to VMware ESX/VC host. (string diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index e2dd02d774cf..c99c02f2066b 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -45,7 +45,8 @@ LOG = logging.getLogger(__name__) vmwareapi_opts = [ cfg.StrOpt('host_ip', - help='URL for connection to VMware ESX/VC host.'), + help='Hostname or IP address for connection to VMware ESX/VC ' + 'host.'), cfg.StrOpt('host_username', help='Username for connection to VMware ESX/VC host.'), cfg.StrOpt('host_password',