Merge "use SERVICE_HOST intead of HOST_IP for quantum services"

This commit is contained in:
Jenkins 2013-05-24 10:53:21 +00:00 committed by Gerrit Code Review
commit 699fec37ed

View File

@ -75,7 +75,7 @@ Q_PLUGIN=${Q_PLUGIN:-openvswitch}
# Default Quantum Port # Default Quantum Port
Q_PORT=${Q_PORT:-9696} Q_PORT=${Q_PORT:-9696}
# Default Quantum Host # Default Quantum Host
Q_HOST=${Q_HOST:-$HOST_IP} Q_HOST=${Q_HOST:-$SERVICE_HOST}
# Default admin username # Default admin username
Q_ADMIN_USERNAME=${Q_ADMIN_USERNAME:-quantum} Q_ADMIN_USERNAME=${Q_ADMIN_USERNAME:-quantum}
# Default auth strategy # Default auth strategy
@ -86,7 +86,7 @@ Q_USE_NAMESPACE=${Q_USE_NAMESPACE:-True}
Q_OVS_USE_VETH=${Q_OVS_USE_VETH:-False} Q_OVS_USE_VETH=${Q_OVS_USE_VETH:-False}
Q_USE_ROOTWRAP=${Q_USE_ROOTWRAP:-True} Q_USE_ROOTWRAP=${Q_USE_ROOTWRAP:-True}
# Meta data IP # Meta data IP
Q_META_DATA_IP=${Q_META_DATA_IP:-$HOST_IP} Q_META_DATA_IP=${Q_META_DATA_IP:-$SERVICE_HOST}
# Allow Overlapping IP among subnets # Allow Overlapping IP among subnets
Q_ALLOW_OVERLAPPING_IP=${Q_ALLOW_OVERLAPPING_IP:-True} Q_ALLOW_OVERLAPPING_IP=${Q_ALLOW_OVERLAPPING_IP:-True}
# Use quantum-debug command # Use quantum-debug command