Merge pull request #133 from shawnsi/master

Vagrant Provision Touch Up
Upstream-commit: 690cae0ef442301a97546f953dfdc8b661f3d9ef
Component: engine

components/engine/puppet/modules/docker/manifests/init.pp

@@ -80,7 +80,7 @@ class docker {
         owner => "root",
         group => "root",
         content => template("docker/dockerd.conf"),
-        require => Exec["fetch-docker"],
+        require => Exec["copy-docker-bin"],
     }
 
     file { "/home/vagrant":

components/engine/puppet/modules/docker/templates/dockerd.conf

@@ -8,5 +8,5 @@ respawn
 
 script
     test -f /etc/default/locale && . /etc/default/locale || true
-    LANG=$LANG LC_ALL=$LANG /usr/local/bin/docker -d
+    LANG=$LANG LC_ALL=$LANG /usr/local/bin/docker -d >> /var/log/dockerd 2>&1
 end script