openstack
/
devstack
Code Issues Proposed changes

Merge "fix support for VMware vCenter Driver"

This commit is contained in:
Jenkins 2013-04-26 12:38:36 +00:00 committed by Gerrit Code Review
parent 0906621356 a418af9503
commit 92034a4484
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
stack.sh
View File

@ -957,6 +957,18 @@ if is_service_enabled nova; then
iniset $NOVA_CONF DEFAULT powervm_img_remote_path $POWERVM_IMG_REMOTE_PATH
iniset $NOVA_CONF DEFAULT powervm_img_local_path $POWERVM_IMG_LOCAL_PATH
# vSphere API
# -------
elif [ "$VIRT_DRIVER" = 'vsphere' ]; then
echo_summary "Using VMware vCenter driver"
iniset $NOVA_CONF DEFAULT compute_driver "vmwareapi.VMwareVCDriver"
VMWAREAPI_USER=${VMWAREAPI_USER:-"root"}
iniset $NOVA_CONF DEFAULT vmwareapi_host_ip "$VMWAREAPI_IP"
iniset $NOVA_CONF DEFAULT vmwareapi_host_username "$VMWAREAPI_USER"
iniset $NOVA_CONF DEFAULT vmwareapi_host_password "$VMWAREAPI_PASSWORD"
iniset $NOVA_CONF DEFAULT vmwareapi_cluster_name "$VMWAREAPI_CLUSTER"
# Default
# -------

2
stackrc
View File

@ -199,6 +199,8 @@ case "$VIRT_DRIVER" in
IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz"};;
esac
;;
vsphere)
IMAGE_URLS="";;
*) # otherwise, use the uec style image (with kernel, ramdisk, disk)
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.1-x86_64-uec}
IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz"};;