Wait for Grafana service before running grafana.client
Change-Id: Iec3b19a8bfec4685c1ba71cd9eb4ec6af92d3e11
diff --git a/scripts/stacklightv2_infra_install.sh b/scripts/stacklightv2_infra_install.sh
index da8f951..dc6fd0c 100755
--- a/scripts/stacklightv2_infra_install.sh
+++ b/scripts/stacklightv2_infra_install.sh
@@ -1,6 +1,16 @@
#!/bin/bash -x
exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
+CWD="$(dirname "$(readlink -f "$0")")"
+
+# Import common functions
+COMMONS="$CWD"/common_functions.sh
+if [ ! -f "$COMMONS" ]; then
+ echo "File $COMMONS does not exist"
+ exit 1
+fi
+. "$COMMONS"
+
# Configure Telegraf
salt -C 'I@telegraf:agent' state.sls telegraf
@@ -29,4 +39,6 @@
salt -C 'I@docker:swarm' dockerng.ps
# Configure Grafana dashboards and datasources
+stacklight_vip=$(get_param_value stacklight_monitor_address)
+wait_for_http_service "http://${stacklight_vip}:15013/"
salt -C 'I@grafana:client' state.sls grafana.client