From 22e86f8d7dbc016df07e38d4f4715d9d622e5449 Mon Sep 17 00:00:00 2001
From: "Casandra H. Qiu" <cxhong@c910loginx02.pok.stglabs.ibm.com>
Date: Sun, 28 Apr 2019 20:23:28 -0400
Subject: [PATCH] Filter out the http port from cumulus-provision-url

---
 xCAT/postscripts/configinterface    | 1 +
 xCAT/postscripts/cumulusztp         | 1 +
 xCAT/postscripts/documulusdiscovery | 1 +
 3 files changed, 3 insertions(+)

diff --git a/xCAT/postscripts/configinterface b/xCAT/postscripts/configinterface
index 1ec8d0d8b..f21d0d8cd 100755
--- a/xCAT/postscripts/configinterface
+++ b/xCAT/postscripts/configinterface
@@ -15,6 +15,7 @@ fi
 
 if [ -z "$MASTER" ]; then
     MASTER=$(cat /var/lib/dhcp/dhclient.eth0.leases|sed -n 's/.*cumulus-provision-url.*http:\/\+\([^\/]\+\)\/.*/\1/p'|tail -1)
+    MASTER=$(echo $MASTER | awk -F: '{print $1}')
     if [ -z "$MASTER" ]; then
         echo "xCAT Master unset! Cannot download interface description"
         exit 2
diff --git a/xCAT/postscripts/cumulusztp b/xCAT/postscripts/cumulusztp
index e9f7a8e6c..38f5ddad9 100755
--- a/xCAT/postscripts/cumulusztp
+++ b/xCAT/postscripts/cumulusztp
@@ -35,6 +35,7 @@ function get_last_lease()
 
 #get ip address for server node
 server_ip="$(grep 'cumulus-provision-url' < <(get_last_lease eth0) | awk -F/ '{print $3}')"
+server_ip="$(echo $server_ip | awk -F: '{print $1}')"
 hashostname="$(grep 'host-name' < <(get_last_lease eth0))"
 
 #download /install/postscripts from MN
diff --git a/xCAT/postscripts/documulusdiscovery b/xCAT/postscripts/documulusdiscovery
index c3e9d8db7..0d69111a5 100755
--- a/xCAT/postscripts/documulusdiscovery
+++ b/xCAT/postscripts/documulusdiscovery
@@ -4,6 +4,7 @@
 
 # TODO: Figure out the master based on the DHCP packet
 XCATMASTER=$(cat /var/lib/dhcp/dhclient.eth0.leases |grep cumulus-provision-url|tail -1|awk -F/ '{print $3}')
+XCATMASTER=$(echo $XCATMASTER | awk -F: '{print $1}') 
 XCATPORT=3001
 log_label="xcat.documulusdiscovery"