openstack
/
monasca-api
Code Issues Proposed changes

Allow to enforce APACHE_MIRROR 

In some cases APACHE_MIRROR that is picked points
at the server from which it is not possible to download
the binaries.

Change-Id: I08f1d48cc8bdac7d9d489684e0f6e45c29b95119
This commit is contained in:
Tomasz Trębski 2017-06-22 09:55:59 +02:00
parent 48f5909910
commit 751d4893c1
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devstack/README.md
View File

@ -133,6 +133,15 @@ a.k.a.
enable_service postgresql
```
## Enforcing Apache mirror
If, for any reason, ```APACHE_MIRROR``` that is picked is not working, you can
enforce it in following way:
```sh
APACHE_MIRROR=http://www-us.apache.org/dist/
```
# License
(c) Copyright 2015-2016 Hewlett Packard Enterprise Development Company LP

11
devstack/plugin.sh
View File

@ -317,7 +317,7 @@ function install_kafka {
echo_summary "Install Monasca Kafka"
local kafka_tarball=kafka_${KAFKA_VERSION}.tgz
local kafka_tarball_url=${apache_mirror}kafka/${BASE_KAFKA_VERSION}/${kafka_tarball}
local kafka_tarball_url=${APACHE_MIRROR}kafka/${BASE_KAFKA_VERSION}/${kafka_tarball}
local kafka_tarball_dest=${FILES}/${kafka_tarball}
download_file ${kafka_tarball_url} ${kafka_tarball_dest}
@ -1297,7 +1297,7 @@ function install_storm {
echo_summary "Install Monasca Storm"
local storm_tarball=apache-storm-${STORM_VERSION}.tar.gz
local storm_tarball_url=${apache_mirror}storm/apache-storm-${STORM_VERSION}/${storm_tarball}
local storm_tarball_url=${APACHE_MIRROR}storm/apache-storm-${STORM_VERSION}/${storm_tarball}
local storm_tarball_dest=${FILES}/${storm_tarball}
download_file ${storm_tarball_url} ${storm_tarball_dest}
@ -1839,9 +1839,14 @@ function install_gate_config_holder {
}
function find_nearest_apache_mirror {
apache_mirror=`curl -s 'https://www.apache.org/dyn/closer.cgi?as_json=1' | jq --raw-output '.preferred'`
if [ -z $APACHE_MIRROR ]; then
local mirror;
mirror=`curl -s 'https://www.apache.org/dyn/closer.cgi?as_json=1' | jq --raw-output '.preferred'`
APACHE_MIRROR=$mirror
fi
}
# check for service enabled
if is_service_enabled monasca; then

1
devstack/settings
View File

@ -166,6 +166,7 @@ MONASCA_DATABASE_USE_ORM=false
# Other settings
DOWNLOAD_FILE_TIMEOUT=${DOWNLOAD_FILE_TIMEOUT:-30}
PLUGIN_FILES=$MONASCA_API_DIR/devstack/files
# APACHE_MIRROR= # force specific APACHE_MIRROR if the one that got picked fails
# Public configuration
## monasca-statsd