You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2018/08/07 19:36:19 UTC

[trafficcontrol] 05/09: edge cache now using environment config

This is an automated email from the ASF dual-hosted git repository.

dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit 0344fd9bdbfbc887f8509109260885816d33f765
Author: Brennan Fieck <Br...@comcast.com>
AuthorDate: Tue Jul 24 14:00:17 2018 +0000

    edge cache now using environment config
---
 infrastructure/cdn-in-a-box/edge/setup.sh | 34 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/infrastructure/cdn-in-a-box/edge/setup.sh b/infrastructure/cdn-in-a-box/edge/setup.sh
index 05ad7cc..5509dd3 100755
--- a/infrastructure/cdn-in-a-box/edge/setup.sh
+++ b/infrastructure/cdn-in-a-box/edge/setup.sh
@@ -21,57 +21,57 @@ sed -ie "s;MY_GATEWAY;$gateway;g" /server.json
 sed -ie "s;MY_NETMASK;$netmask;g" /server.json
 sed -ie "s;MY_IP;$myIP;g" /server.json
 
-while ! nc trafficops 6443 </dev/null; do
-	echo "waiting for traffic_ops_golang:6443"
+while ! nc $TO_HOST $TO_PORT </dev/null; do
+	echo "waiting for Traffic Ops"
 	sleep 3
 done
 
 # Now network things. First need to authenticate
-curl -ksc cookie.jar -d '{"u":"admin","p":"twelve"}' https://trafficportal/api/1.3/user/login
+curl -ksc cookie.jar -d "{\"u\":\"$TO_ADMIN_USER\",\"p\":\"$TO_ADMIN_PASSWORD\"}" https://$TP_HOST/api/1.3/user/login
 echo
 
 # Gets our CDN ID
-CDN=$(curl -ksb cookie.jar https://trafficportal/api/1.3/cdns)
+CDN=$(curl -ksb cookie.jar https://$TP_HOST/api/1.3/cdns)
 CDN=$(echo $CDN | tr '}' '\n' | grep CDN-in-a-Box | tr ',' '\n' | grep '"id"' | cut -d : -f2)
 while [[ -z "$CDN" ]]; do
 	echo "waiting for trafficops setup to complete..."
 	sleep 3
-	CDN=$(curl -ksb cookie.jar https://trafficportal/api/1.3/cdns)
+	CDN=$(curl -ksb cookie.jar https://$TP_HOST/api/1.3/cdns)
 	CDN=$(echo $CDN | tr '}' '\n' | grep CDN-in-a-Box | tr ',' '\n' | grep '"id"' | cut -d : -f2)
 done
 
 
 # Now we upload a profile for later use
 sed -ie "s;CDN_ID;$CDN;g" /profile.json
-PROFILE=$(curl -ksb cookie.jar -d @/profile.json https://trafficportal/api/1.3/profiles)
+PROFILE=$(curl -ksb cookie.jar -d @/profile.json https://$TP_HOST/api/1.3/profiles)
 PROFILENAME=$(echo $PROFILE | tr ',' '\n' | grep '"name"' | cut -d : -f2 | tr -d '"')
 PROFILEID=$(echo $PROFILE | tr ',{' '\n' | grep '"id"' | cut -d : -f2)
-curl -ksb cookie.jar -d @/parameters.json https://trafficportal/api/1.3/profiles/name/$PROFILENAME/parameters
+curl -ksb cookie.jar -d @/parameters.json https://$TP_HOST/api/1.3/profiles/name/$PROFILENAME/parameters
 echo
 
 # Gets the location ID
-location=$(curl -ksb cookie.jar https://trafficportal/api/1.3/phys_locations)
+location=$(curl -ksb cookie.jar https://$TP_HOST/api/1.3/phys_locations)
 while [[ "$location" == '{"response":[]}' ]]; do
 	echo "Waiting for location setup"
 	sleep 3
-	location=$(curl -ksb cookie.jar https://trafficportal/api/1.3/phys_locations)
+	location=$(curl -ksb cookie.jar https://$TP_HOST/api/1.3/phys_locations)
 done
 location=$(echo $location | tr ']' '\n' | grep CDN_in_a_Box | tr ',' '\n' | grep '"id"' | cut -d ':' -f2)
 
 # Gets the id of a MID server type
-TYPE=$(curl -ksb cookie.jar https://trafficportal/api/1.3/types)
+TYPE=$(curl -ksb cookie.jar https://$TP_HOST/api/1.3/types)
 TYPE=$(echo $TYPE | tr '}' '\n' | grep '"EDGE"' | tr ',' '\n' | grep '"id"' | cut -d : -f2)
 
 # Gets the id of the 'REPORTED' status
-REPORTED=$(curl -ksb cookie.jar https://trafficportal/api/1.3/statuses)
+REPORTED=$(curl -ksb cookie.jar https://$TP_HOST/api/1.3/statuses)
 REPORTED=$(echo $REPORTED | tr '}' '\n' | grep REPORTED | tr ',' '\n' | grep '"id"' | cut -d : -f2)
 
 # Gets the cachegroup ID
-CACHEGROUP=$(curl -ksb cookie.jar https://trafficportal/api/1.3/cachegroups)
+CACHEGROUP=$(curl -ksb cookie.jar https://$TP_HOST/api/1.3/cachegroups)
 while [[ "$CACHEGROUP" == '{"response":[]}' ]]; do
 	echo "waiting for trafficops setup to complete..."
 	sleep 3
-	CACHEGROUP=$(curl -ksb cookie.jar https://trafficportal/api/1.3/cachegroups)
+	CACHEGROUP=$(curl -ksb cookie.jar https://$TP_HOST/api/1.3/cachegroups)
 done
 CACHEGROUP=$(echo $CACHEGROUP | tr '{' '\n' | grep CDN_in_a_Box_Edge | tr ',' '\n' | grep '"id"' | cut -d : -f2)
 
@@ -83,20 +83,20 @@ sed -ie "s;REPORTED_ID;$REPORTED;g" /server.json
 sed -ie "s;CACHE_GROUP_ID;$CACHEGROUP;g" /server.json
 sed -ie "s;MY_PROFILE_ID;$PROFILEID;g" /server.json
 cat /server.json
-SERVER=$(curl -ksb cookie.jar -d @/server.json https://trafficportal/api/1.3/servers)
+SERVER=$(curl -ksb cookie.jar -d @/server.json https://$TP_HOST/api/1.3/servers)
 SERVER=$(echo $SERVER | tr ',' '\n' | grep '"id"' | cut -d : -f2)
 
 
 #finally, link this server to a delivery service
-DSID=$(curl -ksb cookie.jar https://trafficportal/api/1.3/deliveryservices)
+DSID=$(curl -ksb cookie.jar https://$TP_HOST/api/1.3/deliveryservices)
 while [[ "$DSID" == '{"response":[]}' ]]; do
 	echo "Waiting for delivery service creation..."
 	sleep 3
-	DSID=$(curl -ksb cookie.jar https://trafficportal/api/1.3/deliveryservices)
+	DSID=$(curl -ksb cookie.jar https://$TP_HOST/api/1.3/deliveryservices)
 done
 DSID=$(echo $DSID | tr '{' '\n' | grep '"CDN in a Box"' | tr ',' '\n' | grep '"id"' | cut -d : -f2)
 
-curl -ksb cookie.jar -d "{\"dsId\":$DSID,\"servers\":[$SERVER],\"replace\":true}" https://trafficportal/api/1.2/deliveryserviceserver
+curl -ksb cookie.jar -d "{\"dsId\":$DSID,\"servers\":[$SERVER],\"replace\":true}" https://$TP_HOST/api/1.2/deliveryserviceserver
 echo
 
 fg