Adds feature selection in Hyper-V deployment

Author: alexpilotti

deploy-hyperv-compute.sh

@@ -76,16 +76,30 @@ run_wsmancmd_with_retry $HYPERV_COMPUTE_VM_IP $HYPERV_ADMIN $HYPERV_PASSWORD "po
 
 echo "Installing Hyper-V OpenStack Compute on $HYPERV_COMPUTE_VM_IP"
 
+HYPERV_FEATURES="HyperVNovaCompute,iSCSISWInitiator,FreeRDP"
+
 if [ "$OPENSTACK_RELEASE" == "grizzly" ]; then
+    if [ -n "$QUANTUM_ADMIN_AUTH_URL" ]; then
+        HYPERV_FEATURES+=",QuantumHyperVAgent"
+    fi
+
     run_wsmancmd_with_retry $HYPERV_COMPUTE_VM_IP $HYPERV_ADMIN $HYPERV_PASSWORD "msiexec /i %TEMP%\\$MSI_FILE /qn /l*v %TEMP%\\HyperVNovaCompute_setup_log.txt \
-    ADDLOCAL=HyperVNovaCompute,QuantumHyperVAgent,iSCSISWInitiator,FreeRDP GLANCEHOST=$GLANCE_HOST GLANCEPORT=$GLANCE_PORT RPCBACKEND=$RPC_BACKEND \
+    ADDLOCAL=$HYPERV_FEATURES GLANCEHOST=$GLANCE_HOST GLANCEPORT=$GLANCE_PORT RPCBACKEND=$RPC_BACKEND \
     RPCBACKENDHOST=$RPC_BACKEND_HOST RPCBACKENDPORT=$RPC_BACKEND_PORT RPCBACKENDUSER=$RPC_BACKEND_USERNAME RPCBACKENDPASSWORD=$RPC_BACKEND_PASSWORD \
     INSTANCESPATH=C:\\OpenStack\\Instances ADDVSWITCH=0 VSWITCHNAME=$HYPERV_VSWITCH USECOWIMAGES=1 LOGDIR=C:\\OpenStack\\Log ENABLELOGGING=1 \
     VERBOSELOGGING=1 QUANTUMURL=$QUANTUM_URL QUANTUMADMINTENANTNAME=$QUANTUM_ADMIN_TENANT_NAME QUANTUMADMINUSERNAME=$QUANTUM_ADMIN_USERNAME \
     QUANTUMADMINPASSWORD=$QUANTUM_ADMIN_PASSWORD QUANTUMADMINAUTHURL=$QUANTUM_ADMIN_AUTH_URL"
 else
+    if [ -n "$QUANTUM_ADMIN_AUTH_URL" ]; then
+        HYPERV_FEATURES+=",NeutronHyperVAgent"
+    fi
+
+    if [ -n "$CEILOMETER_ADMIN_AUTH_URL" ]; then
+        HYPERV_FEATURES+=",CeilometerComputeAgent"
+    fi
+
     run_wsmancmd_with_retry $HYPERV_COMPUTE_VM_IP $HYPERV_ADMIN $HYPERV_PASSWORD "msiexec /i %TEMP%\\$MSI_FILE /qn /l*v %TEMP%\\HyperVNovaCompute_setup_log.txt \
-    ADDLOCAL=HyperVNovaCompute,NeutronHyperVAgent,CeilometerComputeAgent,iSCSISWInitiator,FreeRDP GLANCEHOST=$GLANCE_HOST GLANCEPORT=$GLANCE_PORT RPCBACKEND=$RPC_BACKEND \
+    ADDLOCAL=$HYPERV_FEATURES GLANCEHOST=$GLANCE_HOST GLANCEPORT=$GLANCE_PORT RPCBACKEND=$RPC_BACKEND \
     RPCBACKENDHOST=$RPC_BACKEND_HOST RPCBACKENDPORT=$RPC_BACKEND_PORT RPCBACKENDUSER=$RPC_BACKEND_USERNAME RPCBACKENDPASSWORD=$RPC_BACKEND_PASSWORD \
     INSTANCESPATH=C:\\OpenStack\\Instances ADDVSWITCH=0 VSWITCHNAME=$HYPERV_VSWITCH USECOWIMAGES=1 LOGDIR=C:\\OpenStack\\Log ENABLELOGGING=1 \
     VERBOSELOGGING=1 NEUTRONURL=$QUANTUM_URL NEUTRONADMINTENANTNAME=$QUANTUM_ADMIN_TENANT_NAME NEUTRONADMINUSERNAME=$QUANTUM_ADMIN_USERNAME \