From a418af9503d6e5d7b767d6840efd6eb7ca199e13 Mon Sep 17 00:00:00 2001 From: hartsocks Date: Wed, 24 Apr 2013 14:49:56 -0700 Subject: [PATCH] fix support for VMware vCenter Driver Change-Id: Iedd26dbb89731f49718604eb09eb84b3e0b648c0 --- stack.sh | 12 ++++++++++++ stackrc | 2 ++ 2 files changed, 14 insertions(+) diff --git a/stack.sh b/stack.sh index e7c1babb87..726f1bd37e 100755 --- a/stack.sh +++ b/stack.sh @@ -948,6 +948,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 # ------- diff --git a/stackrc b/stackrc index c55e8dc78e..f99eab1852 100644 --- a/stackrc +++ b/stackrc @@ -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"};;