Merge pull request #36 from ladar/master

Replace Atlas Cloud with Vagrant Cloud.

.travis.yml

@@ -28,7 +28,8 @@ install:
 
 script:
 - ./packer --version
-- ./packer validate  -var "iso_url=https://downloads.archlinux.de/iso/$(date +'%Y.%m').01/archlinux-$(date +'%Y.%m').01-x86_64.iso" -var "iso_checksum_url=https://downloads.archlinux.de/iso/$(date +'%Y.%m').01/sha1sums.txt"  vagrant.json
+- # ./packer validate  -var "iso_url=https://downloads.archlinux.de/iso/$(date +'%Y.%m').01/archlinux-$(date +'%Y.%m').01-x86_64.iso" -var "iso_checksum_url=https://downloads.archlinux.de/iso/$(date +'%Y.%m').01/sha1sums.txt"  vagrant.json
+- jq ".\"post-processors\"[0] |= map(select(.\"type\" != \"vagrant-cloud\"))" vagrant.json | ./packer validate -var "iso_url=https://downloads.archlinux.de/iso/$(date +'%Y.%m').01/archlinux-$(date +'%Y.%m').01-x86_64.iso" -var "iso_checksum_url=https://downloads.archlinux.de/iso/$(date +'%Y.%m').01/sha1sums.txt" -
 
 notifications:
   - email: false

README.md

@@ -29,10 +29,10 @@ Here is an overview over all variables you can set in `vagrant.json` or
 * `memory`: this specifies the size of the RAM in bytes.
 * `cpus`: this specifies the number of cores for your VM.
 * `headless`: this sets GUI on or off.
-* `atlas_token`: here you can specify the atlas token for uploading your
-  box to the vagrantcloud. If you don't have any atlas token you can
-  ignore this variable. But then don't be suprised when the process
-  fails. The boxes are build, they just haven't been uploaded.
+* `vagrant_cloud_token`: here you can specify the vagrant cloud token for 
+  uploading your box to the vagrantcloud. If you don't have a vagrant cloud 
+  token you can ignore this variable. Without a token the boxes will be
+  built, but the upload step step will fail.
 * `write_zeroes`: this variable is empty. if you set any string in this
   variable it will fill the box with zeros to reduce the size. **DO NOT
   use this if you are running a SSD. It will harm your SSDs lifetime**

local.json

@@ -6,7 +6,7 @@
     "memory": "1024",
     "cpus": "2",
     "headless": "true",
-    "atlas_token": "PLACEHOLDER",
+    "vagrant_cloud_token": "PLACEHOLDER",
     "write_zeroes": "",
     "boot_wait": "60s"
 

vagrant.json

@@ -7,7 +7,7 @@
         "memory": "1024",
         "cpus": "2",
         "headless": "true",
-        "atlas_token": "PLACEHOLDER",
+        "vagrant_cloud_token": "PLACEHOLDER",
         "write_zeroes": "",
         "boot_wait": "60s"
     },
@@ -90,7 +90,8 @@
             "ssh_wait_timeout": "10000s",
             "shutdown_command": "sudo systemctl poweroff",
             "headless": "{{user `headless`}}",
-            "vmx_data": {"memsize": "{{user `memory`}}"},
+            "memory": "{{user `memory`}}",
+            "cpus": "{{user `cpus`}}",
             "boot_command": [
                 "<enter><wait10><wait10><wait10><wait10><wait10><enter><enter>",
                 "curl -O 'http://{{.HTTPIP}}:{{.HTTPPort}}/install{,-chroot}.sh'<enter><wait>",
@@ -148,21 +149,21 @@
             {
                 "type": "vagrant-cloud",
                 "only": ["virtualbox-iso"],
-                "access_token": "{{user `atlas_token`}}",
+                "access_token": "{{user `vagrant_cloud_token`}}",
                 "box_tag": "archlinux/archlinux",
                 "version": "{{isotime \"2006.01.02\"}}"
             },
             {
                 "type": "vagrant-cloud",
                 "only": ["qemu"],
-                "access_token": "{{user `atlas_token`}}",
+                "access_token": "{{user `vagrant_cloud_token`}}",
                 "box_tag": "archlinux/archlinux",
                 "version": "{{isotime \"2006.01.02\"}}"
             },
             {
                 "type": "vagrant-cloud",
                 "only": ["vmware-iso"],
-                "access_token": "{{user `atlas_token`}}",
+                "access_token": "{{user `vagrant_cloud_token`}}",
                 "box_tag": "archlinux/archlinux",
                 "version": "{{isotime \"2006.01.02\"}}"
             }