openstack/freezer-api
Code Issues Proposed changes

Improve keystone_authtoken configuration

Browse Source 
Use built-in devstack function for that.
Also create and configure api cache directory.

Change-Id: Ide22b6e72c3942e72bf22141b412ad94b14a7ffb
This commit is contained in:
Vitaliy 2017-05-16 14:05:10 +00:00
parent 8d0366a3de
commit afdd23b950
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
devstack/lib/freezer-api
View File

@ -63,6 +63,7 @@ function cleanup_freezer_api {
disable_apache_site freezer-api disable_apache_site freezer-api
sudo rm -f $(apache_site_config_for freezer-api) sudo rm -f $(apache_site_config_for freezer-api)
${TOP_DIR}/pkg/elasticsearch.sh uninstall ${TOP_DIR}/pkg/elasticsearch.sh uninstall
sudo rm -rf $FREEZER_API_AUTH_CACHE_DIR $FREEZER_API_CONF_DIR
} }
# executed during: stack install # executed during: stack install
@ -115,15 +116,16 @@ function configure_freezer_api {
iniset $FREEZER_API_CONF 'elasticsearch' number_of_replicas 0 iniset $FREEZER_API_CONF 'elasticsearch' number_of_replicas 0
iniset $FREEZER_API_CONF 'elasticsearch' hosts http://$SERVICE_HOST:9200 iniset $FREEZER_API_CONF 'elasticsearch' hosts http://$SERVICE_HOST:9200
# create freezer_api_cache_dir
sudo mkdir -p $FREEZER_API_AUTH_CACHE_DIR/api
sudo chown $STACK_USER $FREEZER_API_AUTH_CACHE_DIR/api
rm -f $FREEZER_API_AUTH_CACHE_DIR/api/*
sudo mkdir -p $FREEZER_API_AUTH_CACHE_DIR/registry
sudo chown $STACK_USER $FREEZER_API_AUTH_CACHE_DIR/registry
rm -f $FREEZER_API_AUTH_CACHE_DIR/registry/*
# set keystone configuration # set keystone configuration
iniset $FREEZER_API_CONF 'keystone_authtoken' auth_protocol $KEYSTONE_AUTH_PROTOCOL configure_auth_token_middleware $FREEZER_API_CONF freezer $FREEZER_API_AUTH_CACHE_DIR/api
iniset $FREEZER_API_CONF 'keystone_authtoken' auth_host $KEYSTONE_AUTH_HOST
iniset $FREEZER_API_CONF 'keystone_authtoken' auth_port $KEYSTONE_AUTH_PORT
iniset $FREEZER_API_CONF 'keystone_authtoken' admin_user freezer
iniset $FREEZER_API_CONF 'keystone_authtoken' admin_password $SERVICE_PASSWORD
iniset $FREEZER_API_CONF 'keystone_authtoken' admin_tenant_name $SERVICE_TENANT_NAME
iniset $FREEZER_API_CONF 'keystone_authtoken' auth_uri $KEYSTONE_AUTH_URI_V3
iniset $FREEZER_API_CONF 'keystone_authtoken' identity_uri $KEYSTONE_AUTH_URI
if [[ "${FREEZER_API_SERVER_TYPE}" == "apache2" ]]; then if [[ "${FREEZER_API_SERVER_TYPE}" == "apache2" ]]; then
echo_summary "Configuring Freezer API wsgi app in Apache" echo_summary "Configuring Freezer API wsgi app in Apache"

1
devstack/settings
View File

@ -21,6 +21,7 @@ FREEZER_API_FILES=${FREEZER_API_DIR}/devstack/files
FREEZER_API_CONF_DIR=${FREEZER_API_CONF_DIR:-/etc/freezer} FREEZER_API_CONF_DIR=${FREEZER_API_CONF_DIR:-/etc/freezer}
FREEZER_API_CONF=$FREEZER_API_CONF_DIR/freezer-api.conf FREEZER_API_CONF=$FREEZER_API_CONF_DIR/freezer-api.conf
FREEZER_API_LOG_DIR=$DEST/logs FREEZER_API_LOG_DIR=$DEST/logs
FREEZER_API_AUTH_CACHE_DIR=${FREEZER_API_AUTH_CACHE_DIR:-/var/cache/freezer-api}
# Freezer API repository # Freezer API repository
FREEZER_API_REPO=${FREEZER_API_REPO:-${GIT_BASE}/openstack/freezer-api.git} FREEZER_API_REPO=${FREEZER_API_REPO:-${GIT_BASE}/openstack/freezer-api.git}