add docker_image_name attribute to VSGService
Change-Id: I27cd9ffd4629823f0f9cfe17c70038c2122929fc
diff --git a/xos/synchronizer/templates/docker.j2 b/xos/synchronizer/templates/docker.j2
new file mode 100644
index 0000000..48f5c5c
--- /dev/null
+++ b/xos/synchronizer/templates/docker.j2
@@ -0,0 +1,17 @@
+# Docker Upstart and SysVinit configuration file
+
+# Customize location of Docker binary (especially for development testing).
+#DOCKER="/usr/local/bin/docker"
+
+# Use DOCKER_OPTS to modify the daemon startup options.
+#DOCKER_OPTS="--dns 8.8.8.8 --dns 8.8.4.4"
+
+DOCKER_OPTS="{{ docker_opts }}"
+
+#"--insecure-registry 10.1.0.1:5000"
+
+# If you need Docker to use an HTTP proxy, it can also be specified here.
+#export http_proxy="http://127.0.0.1:3128/"
+
+# This is also a handy place to tweak where Docker's temporary files go.
+#export TMPDIR="/mnt/bigdrive/docker-tmp"
diff --git a/xos/synchronizer/templates/start-vcpe-vtn.sh.j2 b/xos/synchronizer/templates/start-vcpe-vtn.sh.j2
index dfdce0a..a309ae0 100644
--- a/xos/synchronizer/templates/start-vcpe-vtn.sh.j2
+++ b/xos/synchronizer/templates/start-vcpe-vtn.sh.j2
@@ -15,13 +15,13 @@
docker inspect $VCPE > /dev/null 2>&1
if [ "$?" == 1 ]
then
- docker pull andybavier/docker-vcpe
+ docker pull {{ docker_remote_image_name }}
docker run -d --name=$VCPE --privileged=true --net=none \
-v /var/container_volumes/$VCPE/mount:/mount:ro \
-v /var/container_volumes/$VCPE/etc/dnsmasq.d:/etc/dnsmasq.d:ro \
-v /var/container_volumes/$VCPE/etc/service/message:/etc/service/message \
-v /var/container_volumes/$VCPE/usr/local/sbin:/usr/local/sbin:ro \
- andybavier/docker-vcpe
+ {{ docker_local_image_name }}
else
docker start $VCPE
fi