openstack/blazar
Code Issues Proposed changes

Clean up DevStack plugin

Browse Source 
* Replace use of deprecated function configure_auth_token_middleware
* Remove PKI configuration
* Remove support for non-RabbitMQ messaging

Change-Id: Ieb35df4d1d4af8f229b48bc86a707feb99a0f27f
This commit is contained in:
Pierre Riteau 2019-10-04 18:13:57 +02:00
parent 1b81775d4d
commit b0b6e78ad3
2 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
devstack/plugin.sh
View File

@ -1,4 +1,4 @@
# Install and start **blazar** reservations service # Install and start **blazar** reservation service
# Save trace setting # Save trace setting
XTRACE=$(set +o | grep xtrace) XTRACE=$(set +o | grep xtrace)
@ -21,19 +21,6 @@ function is_blazar_enabled {
return 1 return 1
} }
# Oslo.Messaging RPC iniupdate configuration
function iniupdate_rpc_backend {
local file=$1
local section=$2
if is_service_enabled zeromq; then
iniset $file $section rpc_backend zmq
elif is_service_enabled qpid || [ -n "$QPID_HOST" ]; then
iniset $file $section rpc_backend qpid
elif is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; then
iniset $file $section rpc_backend rabbit
fi
}
# configure_blazar() - Set config files, create data dirs, etc # configure_blazar() - Set config files, create data dirs, etc
function configure_blazar { function configure_blazar {
if [[ ! -d $BLAZAR_CONF_DIR ]]; then if [[ ! -d $BLAZAR_CONF_DIR ]]; then
@ -70,7 +57,6 @@ function configure_blazar {
iniset $BLAZAR_CONF_FILE DEFAULT use_syslog $SYSLOG iniset $BLAZAR_CONF_FILE DEFAULT use_syslog $SYSLOG
iniset_rpc_backend blazar $BLAZAR_CONF_FILE DEFAULT iniset_rpc_backend blazar $BLAZAR_CONF_FILE DEFAULT
iniupdate_rpc_backend $BLAZAR_CONF_FILE DEFAULT
setup_logging $BLAZAR_CONF_FILE setup_logging $BLAZAR_CONF_FILE
@ -114,23 +100,8 @@ function configure_blazar {
function _blazar_setup_keystone { function _blazar_setup_keystone {
local conf_file=$1 local conf_file=$1
local section=$2 local section=$2
local use_auth_url=$3
if [[ -z $skip_auth_cache ]]; then configure_keystone_authtoken_middleware $conf_file $BLAZAR_USER_NAME $section
iniset $conf_file $section signing_dir $BLAZAR_AUTH_CACHE_DIR
# Create cache dir
create_blazar_cache_dir
fi
configure_auth_token_middleware $conf_file $BLAZAR_USER_NAME $BLAZAR_AUTH_CACHE_DIR $section
}
# create_blazar_cache_dir() - Part of the _blazar_setup_keystone process
function create_blazar_cache_dir {
# Create cache dir
sudo mkdir -m 700 -p $BLAZAR_AUTH_CACHE_DIR
sudo chown $STACK_USER $BLAZAR_AUTH_CACHE_DIR
rm -f $BLAZAR_AUTH_CACHE_DIR/*
} }
# create_blazar_aggregate_freepool() - Create a Nova aggregate to use as freepool (for host reservation) # create_blazar_aggregate_freepool() - Create a Nova aggregate to use as freepool (for host reservation)
@ -236,10 +207,7 @@ function clean_blazar_configuration {
if is_service_enabled blazar blazar-m blazar-a; then if is_service_enabled blazar blazar-m blazar-a; then
if [[ "$1" == "stack" && "$2" == "pre-config" ]]; then if [[ "$1" == "stack" && "$2" == "install" ]]; then
echo "Pre installation steps for Blazar"
iniupdate_rpc_backend
elif [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Installing Blazar" echo_summary "Installing Blazar"
# Use stack_install_service here to account for virtualenv # Use stack_install_service here to account for virtualenv
stack_install_service blazar stack_install_service blazar

1
devstack/settings
View File

@ -25,7 +25,6 @@ BLAZAR_DIR=$DEST/blazar
BLAZAR_CONF_DIR=${BLAZAR_CONF_DIR:-/etc/blazar} BLAZAR_CONF_DIR=${BLAZAR_CONF_DIR:-/etc/blazar}
BLAZAR_CONF_FILE=$BLAZAR_CONF_DIR/blazar.conf BLAZAR_CONF_FILE=$BLAZAR_CONF_DIR/blazar.conf
BLAZARCLIENT_DIR=$DEST/python-blazarclient BLAZARCLIENT_DIR=$DEST/python-blazarclient
BLAZAR_AUTH_CACHE_DIR=${BLAZAR_AUTH_CACHE_DIR:-/var/cache/blazar}
BLAZARNOVA_DIR=$DEST/blazar-nova BLAZARNOVA_DIR=$DEST/blazar-nova
BLAZAR_DASHBOARD_DIR=$DEST/blazar-dashboard BLAZAR_DASHBOARD_DIR=$DEST/blazar-dashboard