openstack/monasca-api
Code Issues Proposed changes

Merge "Remove keystone cache dir"

Browse Source
This commit is contained in:
Zuul
2017-10-19 06:28:09 +00:00
committed by Gerrit Code Review
parent 99bfec7194 8d87c463bb
commit 37b2111435
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/plugin.sh
View File

@@ -752,7 +752,6 @@ function configure_monasca_api_python {
if is_service_enabled monasca-api; then if is_service_enabled monasca-api; then
echo_summary "Configuring monasca-api python" echo_summary "Configuring monasca-api python"
sudo install -d -o $STACK_USER $MONASCA_API_CONF_DIR sudo install -d -o $STACK_USER $MONASCA_API_CONF_DIR
create_api_cache_dir
sudo mkdir -p /var/log/monasca || true sudo mkdir -p /var/log/monasca || true
@@ -805,7 +804,7 @@ function configure_monasca_api_python {
iniset "$MONASCA_API_CONF" influxdb port 8086 iniset "$MONASCA_API_CONF" influxdb port 8086
# keystone & security # keystone & security
configure_auth_token_middleware $MONASCA_API_CONF "admin" $MONASCA_API_CACHE_DIR configure_auth_token_middleware $MONASCA_API_CONF "admin"
iniset "$MONASCA_API_CONF" keystone_authtoken region_name $REGION_NAME iniset "$MONASCA_API_CONF" keystone_authtoken region_name $REGION_NAME
iniset "$MONASCA_API_CONF" keystone_authtoken project_name "admin" iniset "$MONASCA_API_CONF" keystone_authtoken project_name "admin"
iniset "$MONASCA_API_CONF" keystone_authtoken password $ADMIN_PASSWORD iniset "$MONASCA_API_CONF" keystone_authtoken password $ADMIN_PASSWORD
@@ -830,10 +829,6 @@ function configure_monasca_api_python {
fi fi
} }
function create_api_cache_dir {
sudo install -m 700 -d -o $STACK_USER $MONASCA_API_CACHE_DIR
}
function start_monasca_api_python { function start_monasca_api_python {
if is_service_enabled monasca-api; then if is_service_enabled monasca-api; then
echo_summary "Starting monasca-api" echo_summary "Starting monasca-api"

1
devstack/settings
View File

@@ -185,5 +185,4 @@ MONASCA_API_CONF_DIR=${MONASCA_API_CONF_DIR:-/etc/monasca}
MONASCA_API_CONF=${MONASCA_API_CONF:-$MONASCA_API_CONF_DIR/api-config.conf} MONASCA_API_CONF=${MONASCA_API_CONF:-$MONASCA_API_CONF_DIR/api-config.conf}
MONASCA_API_PASTE_INI=${MONASCA_API_PASTE_INI:-$MONASCA_API_CONF_DIR/api-config.ini} MONASCA_API_PASTE_INI=${MONASCA_API_PASTE_INI:-$MONASCA_API_CONF_DIR/api-config.ini}
MONASCA_API_LOGGING_CONF=${MONASCA_API_LOGGING_CONF:-$MONASCA_API_CONF_DIR/api-logging.conf} MONASCA_API_LOGGING_CONF=${MONASCA_API_LOGGING_CONF:-$MONASCA_API_CONF_DIR/api-logging.conf}
MONASCA_API_CACHE_DIR=${MONASCA_API_CACHE_DIR:-/var/cache/monasca-api}
MONASCA_API_LOG_DIR=${MONASCA_API_LOG_DIR:-/var/log/monasca/api} MONASCA_API_LOG_DIR=${MONASCA_API_LOG_DIR:-/var/log/monasca/api}