From 84cd9ca381ff3e11fba321649a3ca4e058832e84 Mon Sep 17 00:00:00 2001
From: Feilong Wang <flwang@catalyst.net.nz>
Date: Sat, 18 Jan 2020 17:33:30 +1300
Subject: [PATCH] Fix proxy for Grafana script

The prometheus/grafana script needs to download a grafana json
file by curl which doesn't work since the proxy issue. This patch
fixes it.

Task: 38167
Story: 2007005

Change-Id: I51ba108e23524eecc04bbbd47a5b50b8d4a529f9
(cherry picked from commit 4346d776e5887af71e33748212bf4dcc2a220b66)
---
 .../fragments/enable-prometheus-monitoring.sh        | 12 ++++++++++++
 ...fix-proxy-of-grafana-script-8b408d9d103dfc06.yaml |  4 ++++
 2 files changed, 16 insertions(+)
 create mode 100644 releasenotes/notes/fix-proxy-of-grafana-script-8b408d9d103dfc06.yaml

diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh
index 019a9a937c..b5c38b38e2 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh
@@ -5,6 +5,18 @@ printf "Starting to run ${step}\n"
 
 . /etc/sysconfig/heat-params
 
+if [ ! -z "$HTTP_PROXY" ]; then
+    export HTTP_PROXY
+fi
+
+if [ ! -z "$HTTPS_PROXY" ]; then
+    export HTTPS_PROXY
+fi
+
+if [ ! -z "$NO_PROXY" ]; then
+    export NO_PROXY
+fi
+
 function writeFile {
     # $1 is filename
     # $2 is file content
diff --git a/releasenotes/notes/fix-proxy-of-grafana-script-8b408d9d103dfc06.yaml b/releasenotes/notes/fix-proxy-of-grafana-script-8b408d9d103dfc06.yaml
new file mode 100644
index 0000000000..11f8c68d04
--- /dev/null
+++ b/releasenotes/notes/fix-proxy-of-grafana-script-8b408d9d103dfc06.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    This proxy issue of Prometheus/Grafana script has been fixed.