Merge "fix support for VMware vCenter Driver"
This commit is contained in:
commit
92034a4484
12
stack.sh
12
stack.sh
|
@ -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_remote_path $POWERVM_IMG_REMOTE_PATH
|
||||||
iniset $NOVA_CONF DEFAULT powervm_img_local_path $POWERVM_IMG_LOCAL_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
|
# Default
|
||||||
# -------
|
# -------
|
||||||
|
|
||||||
|
|
2
stackrc
2
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"};;
|
IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz"};;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
vsphere)
|
||||||
|
IMAGE_URLS="";;
|
||||||
*) # otherwise, use the uec style image (with kernel, ramdisk, disk)
|
*) # otherwise, use the uec style image (with kernel, ramdisk, disk)
|
||||||
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.1-x86_64-uec}
|
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"};;
|
IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz"};;
|
||||||
|
|
Loading…
Reference in New Issue