Renamed Quantum in Neutron in Hyper-V deployment script

Author: alexpilotti

deploy-hyperv-compute.sh

@@ -3,8 +3,8 @@ set -e
 
 if [ $# -ne 20 ]; then
     echo "Usage: $0 <hyperv_host_ip> <hyperv_admin_username> <hyperv_password> <openstack_release> <vswitch_name> <glance_host> \
-<rpc_backend> <rpc_backend_host> <rpc_backend_username> <rpc_backend_password> <quantum_url> \
-<quantum_admin_auth_url> <quantum_admin_tenant_name> <quantum_admin_username> <quantum_admin_password> \
+<rpc_backend> <rpc_backend_host> <rpc_backend_username> <rpc_backend_password> <neutron_url> \
+<neutron_admin_auth_url> <neutron_admin_tenant_name> <neutron_admin_username> <neutron_admin_password> \
 <ceilometer_admin_auth_url> <ceilometer_admin_tenant_name> <ceilometer_admin_username> <ceilometer_admin_password> \
 <ceilometer_metering_secret>"
     exit 1
@@ -20,11 +20,11 @@ RPC_BACKEND=$7
 RPC_BACKEND_HOST=$8
 RPC_BACKEND_USERNAME=$9
 RPC_BACKEND_PASSWORD=${10}
-QUANTUM_URL=${11}
-QUANTUM_ADMIN_AUTH_URL=${12}
-QUANTUM_ADMIN_TENANT_NAME=${13}
-QUANTUM_ADMIN_USERNAME=${14}
-QUANTUM_ADMIN_PASSWORD=${15}
+NEUTRON_URL=${11}
+NEUTRON_ADMIN_AUTH_URL=${12}
+NEUTRON_ADMIN_TENANT_NAME=${13}
+NEUTRON_ADMIN_USERNAME=${14}
+NEUTRON_ADMIN_PASSWORD=${15}
 CEILOMETER_ADMIN_AUTH_URL=${16}
 CEILOMETER_ADMIN_TENANT_NAME=${17}
 CEILOMETER_ADMIN_USERNAME=${18}
@@ -79,18 +79,18 @@ 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
+    if [ -n "$NEUTRON_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=$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"
+    VERBOSELOGGING=1 QUANTUMURL=$NEUTRON_URL QUANTUMADMINTENANTNAME=$NEUTRON_ADMIN_TENANT_NAME QUANTUMADMINUSERNAME=$NEUTRON_ADMIN_USERNAME \
+    QUANTUMADMINPASSWORD=$NEUTRON_ADMIN_PASSWORD QUANTUMADMINAUTHURL=$NEUTRON_ADMIN_AUTH_URL"
 else
-    if [ -n "$QUANTUM_ADMIN_AUTH_URL" ]; then
+    if [ -n "$NEUTRON_ADMIN_AUTH_URL" ]; then
         HYPERV_FEATURES+=",NeutronHyperVAgent"
     fi
 
@@ -102,8 +102,8 @@ else
     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 \
-    NEUTRONADMINPASSWORD=$QUANTUM_ADMIN_PASSWORD NEUTRONADMINAUTHURL=$QUANTUM_ADMIN_AUTH_URL \
+    VERBOSELOGGING=1 NEUTRONURL=$NEUTRON_URL NEUTRONADMINTENANTNAME=$NEUTRON_ADMIN_TENANT_NAME NEUTRONADMINUSERNAME=$NEUTRON_ADMIN_USERNAME \
+    NEUTRONADMINPASSWORD=$NEUTRON_ADMIN_PASSWORD NEUTRONADMINAUTHURL=$NEUTRON_ADMIN_AUTH_URL \
     CEILOMETERADMINTENANTNAME=$CEILOMETER_ADMIN_TENANT_NAME CEILOMETERADMINUSERNAME=$CEILOMETER_ADMIN_USERNAME \
     CEILOMETERADMINPASSWORD=$CEILOMETER_ADMIN_PASSWORD CEILOMETERADMINAUTHURL=$CEILOMETER_ADMIN_AUTH_URL \
     CEILOMETERMETERINGSECRET=$CEILOMETER_METERING_SECRET"