CORD-616 make sure that platform can install via tunnel and some clean up

Change-Id: I3ce86a41e17135bad00305eb1e419544ae7fc912
diff --git a/roles/xos-vm-install/templates/xos-setup-vars.yml.j2 b/roles/xos-vm-install/templates/xos-setup-vars.yml.j2
index ed22592..95b21b4 100644
--- a/roles/xos-vm-install/templates/xos-setup-vars.yml.j2
+++ b/roles/xos-vm-install/templates/xos-setup-vars.yml.j2
@@ -24,3 +24,5 @@
 docker_registry: "{{ docker_registry }}"
 
 local_docker_registry: "{{ local_docker_registry }}"
+deploy_docker_registry: "{{ deploy_docker_registry }}"
+deploy_docker_tag: "{{ deploy_docker_tag }}"