Merge branch 'master' of github.com:open-cloud/xos
diff --git a/xos/observers/vcpe/templates/dnsmasq_servers.j2 b/xos/observers/vcpe/templates/dnsmasq_servers.j2
index 76b8f1c..0a922fc 100644
--- a/xos/observers/vcpe/templates/dnsmasq_servers.j2
+++ b/xos/observers/vcpe/templates/dnsmasq_servers.j2
@@ -1,5 +1,6 @@
# This file autogenerated by vCPE observer
# It contains a list of DNS servers for dnsmasq to use.
+no-resolv
{% if cdn_enable %}
# CDN
@@ -19,4 +20,5 @@
{% else %}
# use google's DNS service
server=8.8.8.8
+server=8.8.4.4
{% endif %}
diff --git a/xos/observers/vcpe/templates/start-vcpe.sh.j2 b/xos/observers/vcpe/templates/start-vcpe.sh.j2
index a9a8e88..4c98aa3 100755
--- a/xos/observers/vcpe/templates/start-vcpe.sh.j2
+++ b/xos/observers/vcpe/templates/start-vcpe.sh.j2
@@ -6,7 +6,7 @@
docker inspect vcpe > /dev/null 2>&1
if [ "$?" == 1 ]
then
- docker run -d --name=vcpe --privileged=true --net=none andybavier/docker-vcpe
+ docker run -d --name=vcpe --privileged=true --net=none -v /etc/dnsmasq.d/servers.conf:/etc/dnsmasq.d/servers.conf andybavier/docker-vcpe
else
docker start vcpe
fi