From 4149e74b004d41a91b9454b7070fb0f2e3d6969b Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Tue, 29 Nov 2016 11:29:50 +0800
Subject: [PATCH] ova dns

---
 tools/ova/script/common.sh         | 41 ++++++++++++++++++++++++++++++
 tools/ova/script/config.sh         |  2 +-
 tools/ova/script/firstboot.sh      |  6 +++--
 tools/ova/script/subsequentboot.sh |  3 +++
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/tools/ova/script/common.sh b/tools/ova/script/common.sh
index edd27293d..0ef46fe55 100755
--- a/tools/ova/script/common.sh
+++ b/tools/ova/script/common.sh
@@ -90,4 +90,45 @@ function configureHarborCfg {
 	then
 		sed -i -r s%"#?$cfg_key\s*=\s*.*"%"$cfg_key = $cfg_value"% $cfg_file
 	fi
+}
+
+function configureDockerDNS {
+	echo "Resetting DNS using vami_ovf_process..."
+	/opt/vmware/share/vami/vami_ovf_process --setnetwork || true
+
+	sed -n -e 's/^nameserver //p' /etc/resolv.conf > /tmp/dns
+	readarray dns < /tmp/dns
+	
+	opts=""
+	for d in "${dns[@]}"
+	do
+		if [ -n "$d" ]
+		then
+			opts="--dns=$d $opts"
+		fi
+	done
+	rm /tmp/dns
+	
+	domain=$(sed -n -e 's/^domain //p' /etc/resolv.conf)
+	if [ -n "$domain" ]
+	then
+		opts="--dns-search=$domain $opts"
+	fi
+	
+	search=$(sed -n -e 's/^search //p' /etc/resolv.conf)
+    if [ -n "$search" ]
+	then
+		searcharray=($search)
+		for s in "${searcharray[@]}"
+		do
+			if [ -n "$s" ]
+			then
+				opts="--dns-search=$s $opts"
+			fi
+		done
+	fi
+	
+	echo Setting docker: $opts
+	echo DOCKER_OPTS=$opts > /etc/default/docker
+	systemctl restart docker
 }
\ No newline at end of file
diff --git a/tools/ova/script/config.sh b/tools/ova/script/config.sh
index 655bd64f5..d5abced0e 100755
--- a/tools/ova/script/config.sh
+++ b/tools/ova/script/config.sh
@@ -139,7 +139,7 @@ function detectHostname {
 	#	echo "Get hostname from ovfenv: $hostname"
 	#	return
 	#fi
-	echo "Resetting DNS and hostname using vami_ovf_process..."
+	echo "Resetting hostname using vami_ovf_process..."
 	/opt/vmware/share/vami/vami_ovf_process --setnetwork || true
 	hostname=$(hostname --fqdn) || true
 	if [ -n $hostname ]
diff --git a/tools/ova/script/firstboot.sh b/tools/ova/script/firstboot.sh
index b71eaa7fa..df6cdbed8 100755
--- a/tools/ova/script/firstboot.sh
+++ b/tools/ova/script/firstboot.sh
@@ -25,8 +25,10 @@ addIptableRules
 echo "Installing docker compose..."
 installDockerCompose
 
-echo "Starting docker service..."
-systemctl start docker
+#echo "Starting docker service..."
+#systemctl start docker
+echo "Configuring docker..."
+configureDockerDNS
 
 echo "Uncompress Harbor offline instaler tar..."
 tar -zxvf $base_dir/../harbor-offline-installer*.tgz -C $base_dir/../
diff --git a/tools/ova/script/subsequentboot.sh b/tools/ova/script/subsequentboot.sh
index b6b1c356b..99a5b77e0 100755
--- a/tools/ova/script/subsequentboot.sh
+++ b/tools/ova/script/subsequentboot.sh
@@ -33,6 +33,9 @@ fi
 echo "Configuring Harbor..."
 configure
 
+echo "Configuring docker..."
+configureDockerDNS
+
 #Start Harbor
 echo "Starting Harbor..."
 up