From 751d4893c17d684484f78f1e0f6e189b78704541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= <tomasz.trebski@ts.fujitsu.com>
Date: Thu, 22 Jun 2017 09:55:59 +0200
Subject: [PATCH] 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
---
 devstack/README.md |  9 +++++++++
 devstack/plugin.sh | 11 ++++++++---
 devstack/settings  |  1 +
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/devstack/README.md b/devstack/README.md
index 01461c659..72b2623b4 100644
--- a/devstack/README.md
+++ b/devstack/README.md
@@ -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
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index b5252f51c..2b3c9d7e1 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -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
 
diff --git a/devstack/settings b/devstack/settings
index ba06420ba..dfa6afaf0 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -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