openstack/manila
Code Issues Proposed changes

Merge "Fix usage of deprecated devstack function"

Browse Source
This commit is contained in:
Zuul 2019-08-14 15:35:15 +00:00 committed by Gerrit Code Review
commit 0ebd368b44
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devstack/plugin.sh
View File

@ -213,7 +213,7 @@ function configure_manila {
# Remove old conf file if exists # Remove old conf file if exists
rm -f $MANILA_CONF rm -f $MANILA_CONF
configure_auth_token_middleware $MANILA_CONF manila $MANILA_AUTH_CACHE_DIR configure_keystone_authtoken_middleware $MANILA_CONF manila
iniset $MANILA_CONF DEFAULT auth_strategy keystone iniset $MANILA_CONF DEFAULT auth_strategy keystone
iniset $MANILA_CONF DEFAULT debug True iniset $MANILA_CONF DEFAULT debug True
@ -253,13 +253,13 @@ function configure_manila {
iniset $MANILA_CONF DEFAULT replica_state_update_interval $MANILA_REPLICA_STATE_UPDATE_INTERVAL iniset $MANILA_CONF DEFAULT replica_state_update_interval $MANILA_REPLICA_STATE_UPDATE_INTERVAL
if is_service_enabled neutron; then if is_service_enabled neutron; then
configure_auth_token_middleware $MANILA_CONF neutron $MANILA_AUTH_CACHE_DIR neutron configure_keystone_authtoken_middleware $MANILA_CONF neutron neutron
fi fi
if is_service_enabled nova; then if is_service_enabled nova; then
configure_auth_token_middleware $MANILA_CONF nova $MANILA_AUTH_CACHE_DIR nova configure_keystone_authtoken_middleware $MANILA_CONF nova nova
fi fi
if is_service_enabled cinder; then if is_service_enabled cinder; then
configure_auth_token_middleware $MANILA_CONF cinder $MANILA_AUTH_CACHE_DIR cinder configure_keystone_authtoken_middleware $MANILA_CONF cinder cinder
fi fi
# Note: set up config group does not mean that this backend will be enabled. # Note: set up config group does not mean that this backend will be enabled.
@ -662,11 +662,6 @@ function init_manila {
fi fi
fi fi
fi fi
# Create cache dir
sudo mkdir -p $MANILA_AUTH_CACHE_DIR
sudo chown $STACK_USER $MANILA_AUTH_CACHE_DIR
rm -f $MANILA_AUTH_CACHE_DIR/*
} }
# check_nfs_kernel_service_state_ubuntu- Make sure nfsd is running # check_nfs_kernel_service_state_ubuntu- Make sure nfsd is running

1
devstack/settings
View File

@ -42,7 +42,6 @@ MANILA_LOCK_PATH=${MANILA_LOCK_PATH:=$OSLO_LOCK_PATH}
MANILA_LOCK_PATH=${MANILA_LOCK_PATH:=$MANILA_DIR/manila_locks} MANILA_LOCK_PATH=${MANILA_LOCK_PATH:=$MANILA_DIR/manila_locks}
MANILACLIENT_DIR=${MANILACLIENT_DIR:=$DEST/python-manilaclient} MANILACLIENT_DIR=${MANILACLIENT_DIR:=$DEST/python-manilaclient}
MANILA_STATE_PATH=${MANILA_STATE_PATH:=$DATA_DIR/manila} MANILA_STATE_PATH=${MANILA_STATE_PATH:=$DATA_DIR/manila}
MANILA_AUTH_CACHE_DIR=${MANILA_AUTH_CACHE_DIR:-/var/cache/manila}
MANILA_CONF_DIR=${MANILA_CONF_DIR:-/etc/manila} MANILA_CONF_DIR=${MANILA_CONF_DIR:-/etc/manila}
MANILA_CONF=$MANILA_CONF_DIR/manila.conf MANILA_CONF=$MANILA_CONF_DIR/manila.conf