Merge "Use vmware section"

This commit is contained in:
Jenkins 2013-07-26 12:01:10 +00:00 committed by Gerrit Code Review
commit c41a059864

View File

@ -1080,10 +1080,10 @@ if is_service_enabled nova; 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"
iniset $NOVA_CONF vmware host_ip "$VMWAREAPI_IP"
iniset $NOVA_CONF vmware host_username "$VMWAREAPI_USER"
iniset $NOVA_CONF vmware host_password "$VMWAREAPI_PASSWORD"
iniset $NOVA_CONF vmware cluster_name "$VMWAREAPI_CLUSTER"
if is_service_enabled neutron; then
iniset $NOVA_CONF vmware integration_bridge $OVS_BRIDGE
fi