From 0d53aebe6f2e4500b1c788ae262e6d6f6e05284d Mon Sep 17 00:00:00 2001
From: Håkon Hallingstad <hakon@yahoo-inc.com>
Date: Thu, 29 Sep 2016 10:52:08 +0200
Subject: Use VESPA_WEB_SERVICE_PORT

---
 node-admin/scripts/app.sh           | 4 ++--
 node-admin/scripts/common.sh        | 2 +-
 node-admin/scripts/config-server.sh | 2 +-
 node-admin/scripts/node-repo.sh     | 8 +++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'node-admin/scripts')

diff --git a/node-admin/scripts/app.sh b/node-admin/scripts/app.sh
index 83754413508..2757d637dc8 100755
--- a/node-admin/scripts/app.sh
+++ b/node-admin/scripts/app.sh
@@ -101,7 +101,7 @@ function DeployApp {
     # Create tenant
     echo -n "Creating tenant... "
     local create_tenant_response
-    if create_tenant_response=$(curl --silent --show-error -X PUT "http://$CONFIG_SERVER_HOSTNAME:$CONFIG_SERVER_PORT/application/v2/tenant/$TENANT_NAME" 2>&1)
+    if create_tenant_response=$(curl --silent --show-error -X PUT "http://$CONFIG_SERVER_HOSTNAME:$VESPA_WEB_SERVICE_PORT/application/v2/tenant/$TENANT_NAME" 2>&1)
     then
         if ! [[ "$create_tenant_response" =~ "Tenant $TENANT_NAME created" ]] &&
                 ! [[ "$create_tenant_response" =~ "already exists" ]]
@@ -131,7 +131,7 @@ function UndeployApp {
     local app_name=default
     local output
     echo -n "Removing application $TENANT_NAME:$app_name... "
-    if ! output=$(curl --silent --show-error -X DELETE "http://$CONFIG_SERVER_HOSTNAME:$CONFIG_SERVER_PORT/application/v2/tenant/$TENANT_NAME/application/$app_name")
+    if ! output=$(curl --silent --show-error -X DELETE "http://$CONFIG_SERVER_HOSTNAME:$VESPA_WEB_SERVICE_PORT/application/v2/tenant/$TENANT_NAME/application/$app_name")
     then
         echo
         Fail "Failed to remove application: $output"
diff --git a/node-admin/scripts/common.sh b/node-admin/scripts/common.sh
index d07b4adcc5a..6a10fb71a99 100644
--- a/node-admin/scripts/common.sh
+++ b/node-admin/scripts/common.sh
@@ -28,7 +28,7 @@ declare -r NODE_ADMIN_CONTAINER_NAME=node-admin
 declare -r CONFIG_SERVER_CONTAINER_NAME=config-server
 declare -r CONFIG_SERVER_HOSTNAME="$CONFIG_SERVER_CONTAINER_NAME"
 declare -r CONFIG_SERVER_IP="$NETWORK_PREFIX.1.1"
-declare -r CONFIG_SERVER_PORT=19071
+declare -r VESPA_WEB_SERVICE_PORT=4080 # E.g. config server port
 
 declare -r DEFAULT_HOSTED_VESPA_REGION=local-region
 declare -r DEFAULT_HOSTED_VESPA_ENVIRONMENT=prod
diff --git a/node-admin/scripts/config-server.sh b/node-admin/scripts/config-server.sh
index 60b05d4b3cd..f8e0f1a60e4 100755
--- a/node-admin/scripts/config-server.sh
+++ b/node-admin/scripts/config-server.sh
@@ -124,7 +124,7 @@ function Start {
     then
         # Wait for config server to come up
         echo -n "Waiting for healthy Config Server (~30s)"
-        local url="http://$CONFIG_SERVER_HOSTNAME:19071/state/v1/health"
+        local url="http://$CONFIG_SERVER_HOSTNAME:$VESPA_WEB_SERVICE_PORT/state/v1/health"
         while ! curl --silent --fail --max-time 1 "$url" >/dev/null
         do
             echo -n .
diff --git a/node-admin/scripts/node-repo.sh b/node-admin/scripts/node-repo.sh
index a941b16db6b..2e113843916 100755
--- a/node-admin/scripts/node-repo.sh
+++ b/node-admin/scripts/node-repo.sh
@@ -3,6 +3,8 @@
 
 set -e
 
+declare -r VESPA_WEB_SERVICE_PORT=4080
+
 # Output from InnerCurlNodeRepo, see there for details.
 declare CURL_RESPONSE
 
@@ -162,7 +164,7 @@ function ProvisionNode {
     local config_server_hostname="$1"
     local json="$2"
 
-    local url="http://$config_server_hostname:4080/nodes/v2/node"
+    local url="http://$config_server_hostname:$VESPA_WEB_SERVICE_PORT/nodes/v2/node"
 
     CurlOrFail -H "Content-Type: application/json" -X POST -d "$json" "$url"
 }
@@ -172,7 +174,7 @@ function SetNodeState {
     local hostname="$2"
     local state="$3"
 
-    local url="http://$config_server_hostname:4080/nodes/v2/state/$state/$hostname"
+    local url="http://$config_server_hostname:$VESPA_WEB_SERVICE_PORT/nodes/v2/state/$state/$hostname"
     CurlOrFail -X PUT "$url"
 }
 
@@ -284,7 +286,7 @@ function RemoveCommand {
     local hostname
     for hostname in "$@"
     do
-        local url="http://$config_server_hostname:4080/nodes/v2/node/$hostname"
+        local url="http://$config_server_hostname:$VESPA_WEB_SERVICE_PORT/nodes/v2/node/$hostname"
         CurlOrFail -X DELETE "$url"
         echo -n .
     done
-- 
cgit v1.2.3