Fix spawning vagrant

Author: dstufft

conf/vagrant/master.conf

@@ -10,6 +10,8 @@ pillar_roots:
     - /srv/pillar/base
 
 ext_pillar:
+  - dc:
+      "*.vagrant.psf.io": vagrant
   - ca:
       name: PSF_CA
       cert_opts:
@@ -19,6 +21,6 @@ ext_pillar:
         O: Python Software Foundation
         OU: Infrastructure Team
         emailAddress: [email protected]
-  - consul: /etc/consul/.consul.key
-  - dc:
-      "*.vagrant.psf.io": vagrant
+  - consul:
+      key_path: /var/lib/consul/encryption_keys/primary.key
+      acl_path: /var/lib/consul/acl_tokens/