* remove veewee confs

eddyxu · Nov 21, 2013 · 45394e3 · 45394e3
1 parent 255c113
commit 45394e3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 64 deletions.
diff --git a/build_boxes.sh b/build_boxes.sh
diff --git a/buildbot/Vagrantfile b/buildbot/Vagrantfile
@@ -11,10 +11,6 @@ Vagrant.configure("2") do |config|
     slave.vm.box = 'raring'
   end
 
-  config.vm.provider :lxc do |lxc|
-	config.vm.box_url = "http://dl.dropbox.com/u/13510779/lxc-raring-amd64-2013-05-08.box"
-  end
-
   config.vm.define :centos do |centos_config|
 	centos_config.vm.box = "centos"
 	centos_config.vm.box_url = "http://developer.nrel.gov/downloads/vagrant-boxes/CentOS-6.4-x86_64-v20130309.box"

diff --git a/devbox/Vagrantfile b/devbox/Vagrantfile
diff --git a/puppet/vsfs b/puppet/vsfs
diff --git a/templates/ubuntu.json b/templates/ubuntu.json
@@ -1,4 +1,11 @@
 {
+  "variables": {
+	  "iso_url": "http://releases.ubuntu.com/saucy/ubuntu-13.10-server-amd64.iso",
+	  "iso_checksum": "2bead0f1f451734461ff88f913f4b02ba9e873b15f097a5c231bdb3763ea42e3",
+	  "iso_checksum_type": "sha256",
+	  "do_client_id": "",
+	  "do_api_key": ""
+  },
   "builders": [
     {
       "type": "vmware",
@@ -14,9 +21,9 @@
       "boot_wait": "5s",
       "guest_os_type": "ubuntu-64",
       "http_directory": "http",
-      "iso_checksum": "2bead0f1f451734461ff88f913f4b02ba9e873b15f097a5c231bdb3763ea42e3",
-      "iso_checksum_type": "sha256",
-      "iso_url": "http://releases.ubuntu.com/saucy/ubuntu-13.10-server-amd64.iso",
+      "iso_checksum": "{{user `iso_checksum`}}",
+      "iso_checksum_type": "{{user `iso_checksum_type`}}",
+      "iso_url": "{{user `iso_url`}}",
       "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now",
       "ssh_password": "vagrant",
       "ssh_username": "vagrant",
@@ -51,8 +58,8 @@
 		"type": "digitalocean",
 		"image_id": "961965",
 		"size_id": 63,
-		"client_id": "",
-		"api_key": ""
+		"client_id": "{{user `do_client_id`}}",
+		"api_key": "{{user `do_api_key`}}"
 	}
   ],
   "post-processors": [