openstack/devstack
Code Issues Proposed changes

Merge "Clean up local state paths"

Browse Source
This commit is contained in:
Jenkins 2012-10-25 11:36:18 +00:00 committed by Gerrit Code Review
commit 9f8da4b09b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/nova
View File

@ -316,6 +316,7 @@ function create_nova_conf() {
fi fi
if [ -n "$NOVA_STATE_PATH" ]; then if [ -n "$NOVA_STATE_PATH" ]; then
add_nova_opt "state_path=$NOVA_STATE_PATH" add_nova_opt "state_path=$NOVA_STATE_PATH"
add_nova_opt "lock_path=$NOVA_STATE_PATH"
fi fi
if [ -n "$NOVA_INSTANCES_PATH" ]; then if [ -n "$NOVA_INSTANCES_PATH" ]; then
add_nova_opt "instances_path=$NOVA_INSTANCES_PATH" add_nova_opt "instances_path=$NOVA_INSTANCES_PATH"

3
stack.sh
View File

@ -503,7 +503,7 @@ fi
# Set ``SWIFT_DATA_DIR`` to the location of swift drives and objects. # Set ``SWIFT_DATA_DIR`` to the location of swift drives and objects.
# Default is the common DevStack data directory. # Default is the common DevStack data directory.
SWIFT_DATA_DIR=${SWIFT_DATA_DIR:-${DEST}/data/swift} SWIFT_DATA_DIR=${SWIFT_DATA_DIR:-${DATA_DIR}/swift}
# Set ``SWIFT_CONFIG_DIR`` to the location of the configuration files. # Set ``SWIFT_CONFIG_DIR`` to the location of the configuration files.
# Default is ``/etc/swift``. # Default is ``/etc/swift``.
@ -1439,6 +1439,7 @@ if is_service_enabled q-dhcp; then
# Set debug # Set debug
iniset $Q_DHCP_CONF_FILE DEFAULT debug True iniset $Q_DHCP_CONF_FILE DEFAULT debug True
iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
iniset $Q_DHCP_CONF_FILE DEFAULT state_path $DATA_DIR/quantum
quantum_setup_keystone $Q_DHCP_CONF_FILE DEFAULT set_auth_url quantum_setup_keystone $Q_DHCP_CONF_FILE DEFAULT set_auth_url