Fixed #232 -- add vagrant support for Deis development.

Author: mboersma

Gemfile.lock

@@ -8,6 +8,9 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     addressable (2.3.5)
+    akami (1.2.0)
+      gyoku (>= 0.4.0)
+      nokogiri (>= 1.4.0)
     atomic (1.1.14)
     berkshelf (1.2.1)
       activesupport
@@ -47,10 +50,17 @@ GEM
       activesupport (>= 3.2.0)
       hashie (>= 2.0.2)
       multi_json (>= 1.3.0)
+    em-winrm (0.5.4)
+      eventmachine (= 1.0.0.beta.3)
+      mixlib-log (>= 1.3.0)
+      uuidtools (~> 2.1.1)
+      winrm (~> 1.1.0)
     erubis (2.7.0)
+    eventmachine (1.0.0.beta.3)
     excon (0.25.3)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
+    ffi (1.9.0)
     fog (1.15.0)
       builder
       excon (~> 0.25.0)
@@ -63,14 +73,31 @@ GEM
       ruby-hmac
     foodcritic (0.2.0)
     formatador (0.2.4)
+    gssapi (1.0.3)
+      ffi (>= 1.0.1)
+    gyoku (1.1.0)
+      builder (>= 2.1.2)
     hashie (2.0.5)
     highline (1.6.19)
+    httpclient (2.3.4.1)
+    httpi (0.9.7)
+      rack
     i18n (0.6.5)
     ipaddress (0.8.0)
     json (1.7.7)
     knife-ec2 (0.6.4)
       chef (>= 0.10.10)
       fog (~> 1.6)
+    knife-rackspace (0.8.1)
+      chef (>= 0.10.10)
+      fog (~> 1.12)
+      knife-windows
+    knife-windows (0.5.12)
+      em-winrm (= 0.5.4)
+    little-plugger (1.1.3)
+    logging (1.8.1)
+      little-plugger (>= 1.1.3)
+      multi_json (>= 1.3.6)
     mime-types (1.25)
     mini_portile (0.5.1)
     minitar (0.5.4)
@@ -95,6 +122,7 @@ GEM
       net-ssh-gateway (>= 0.99.0)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
+    nori (1.1.5)
     ohai (6.18.0)
       ipaddress
       mixlib-cli
@@ -103,6 +131,7 @@ GEM
       mixlib-shellout
       systemu
       yajl-ruby
+    rack (1.5.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     retryable (1.3.3)
@@ -124,13 +153,33 @@ GEM
       retryable
       solve (>= 0.4.1)
     ruby-hmac (0.4.0)
+    rubyntlm (0.1.1)
+    savon (0.9.5)
+      akami (~> 1.0)
+      builder (>= 2.1.2)
+      gyoku (>= 0.4.0)
+      httpi (~> 0.9)
+      nokogiri (>= 1.4.0)
+      nori (~> 1.0)
+      wasabi (~> 1.0)
     solve (0.8.1)
     systemu (2.5.2)
     thor (0.16.0)
     thread_safe (0.1.3)
       atomic
     timers (1.1.0)
     tzinfo (0.3.37)
+    uuidtools (2.1.4)
+    wasabi (1.0.0)
+      nokogiri (>= 1.4.0)
+    winrm (1.1.3)
+      gssapi (~> 1.0.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (~> 1.6, >= 1.6.1)
+      nokogiri (~> 1.5)
+      rubyntlm (~> 0.1.1)
+      savon (= 0.9.5)
+      uuidtools (~> 2.1.2)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -141,3 +190,4 @@ DEPENDENCIES
   chef
   foodcritic
   knife-ec2
+  knife-rackspace

Vagrantfile

@@ -1,19 +1,35 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-Vagrant.configure("2") do |config|
+VAGRANTFILE_API_VERSION = "2"
 
-  config.vm.box = "deis-controller"
-  config.vm.hostname = "deis-controller"
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
+  # Give each controller and node additional memory
   config.vm.provider :virtualbox do |v|
     v.customize ["modifyvm", :id, "--memory", 2048]
   end
-  
-  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
 
-  config.vm.network :public_network, :bridge => 'en0: Wi-Fi (AirPort)' #, :mac => "08002769c9a0"  
+  # Deis Nodes
+  config.vm.box_url = "https://s3-us-west-2.amazonaws.com/opdemand/deis-node.box"
+  config.vm.box = "deis-node"
+
+  # Deis Controller
+  config.vm.define "deis-controller", primary: true do |controller|
+    controller.vm.hostname = "deis-controller"
+    controller.vm.network "private_network", ip: "192.168.61.100"
+  end
+
+  # Node 1
+  config.vm.define "deis-node-1" do |node1|
+    node1.vm.hostname = "deis-node-1"
+    node1.vm.network "private_network", ip: "192.168.61.101"
+  end
+
+  # Node 2
+  config.vm.define "deis-node-2" do |node2|
+    node2.vm.hostname = "deis-node-2"
+    node2.vm.network "private_network", ip: "192.168.61.102"
+  end
 
-  config.vm.provision :shell, :inline => "echo Bootstrap with: knife bootstrap `/sbin/ifconfig eth1|grep inet|head -1|sed 's/\:/ /'|awk '{print $3}'` -x vagrant -P vagrant -N deis-controller -r role[deis-controller] --sudo"
-  
 end

api/fixtures/initial_data.json

@@ -0,0 +1,49 @@
+#!/opt/deis/controller/venv/bin/python
+#
+# Musters data needed before `git push deis master`.
+#
+import json
+import os
+import sys
+import urllib2 as urllib
+
+
+# An incomplete list of domains we won't use to access the controller
+IGNORE = [
+    'example.com',
+    '127.0.0.1',
+    '127.0.1.1',
+    '0.0.0.0',
+    'localhost',
+]
+
+
+if __name__ == '__main__':
+    # Set up Django so it can find deis/settings.py
+    base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+    sys.path.insert(0, base_path)
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'deis.settings'
+
+    # Find the current Django Site object and see if the user has updated
+    # it to reference a useable domain
+    from django.contrib.sites.models import Site
+    site = Site.objects.get_current()
+    if not any(site.domain.startswith(prefix) for prefix in IGNORE):
+        domain = site.domain
+    # Otherwise, try our old strategy of IP lookup through external services
+    else:
+        try:
+            # first try jsonip.com
+            domain = json.loads(urllib.urlopen(
+                'http://jsonip.com',
+                timeout=10).read())['ip']
+        except urllib.URLError:
+            # fall back to an AWS internal service
+            domain = urllib.urlopen(
+                'http://169.254.169.254/latest/meta-data/public-ipv4',
+                timeout=10).read()
+
+    # Write a small JSON dict to stdout
+    sys.stdout.write(json.dumps({'domain': domain}))
+    sys.stdout.flush()
+    sys.exit(0)

bin/pre-push-hook

@@ -0,0 +1,26 @@
+Provision a Deis Controller on Vagrant
+======================================
+
+This document describes how to set up a Deis controller and two nodes with
+Vagrant for testing.
+
+1. Install VirtualBox version 4.2.18. (Vagrant does not support version 4.3.)
+Then start VirtualBox and install the VirtualBox Extension Pack for 4.2.18.
+
+2. Install Vagrant version 1.3.5 or later. Rather than fight Ruby dependencies,
+use a binary installer from vagrantup.com.
+
+3. Run the provisioning script:
+```console
+$ ./contrib/vagrant/provision-vagrant-controller.sh
+```
+
+This script will:
+- Create the data bags in your Chef account to support Deis
+- Run `vagrant up` to create a Deis controller and 2 static nodes
+- Register the controller with Chef and install Deis and supporting software
+
+
+Mac OS X: if you see an error such as
+"failed to open /dev/vboxnetctl", try restarting VirtualBox:
+sudo /Library/StartupItems/VirtualBox/VirtualBox restart

contrib/vagrant/README.md

@@ -0,0 +1,84 @@
+#!/bin/bash -ex
+
+#
+# Prepare a Deis-optimized AMI from a vanilla Ubuntu 12.04
+# Prepare a Deis-optimized Vagrant box from vanilla Ubuntu 12.04
+#
+# Instructions:
+#
+#   1. Launch a vanilla Ubuntu 12.04 instance with `vagrant up`
+#   2. SSH in with `vagrant ssh`, do `sudo -i` and install the 3.8 kernel with:
+#      apt-get update && apt-get install -yq linux-image-generic-lts-raring linux-headers-generic-lts-raring && reboot
+#   3. After reboot is complete, SSH in again and `uname -r` to confirm kernel is 3.8
+#   4. Run this script (as root!) to optimize the image for fast boot times
+#   5. Create a new box with `vagrant package && cp -f package.box contrib/vagrant/deis-base.box`
+#
+
+# Remove any temporary work files, including the postinstall.sh script
+rm -f /home/${account}/{*.iso,postinstall*.sh}
+
+# Install some essentials and mDNS daemon
+apt-get install python-software-properties curl apt-transport-https -y
+
+# Add the Docker repository key to your local keychain
+# using apt-key finger you can check the fingerprint matches 36A1 D786 9245 C895 0F96 6E92 D857 6A8B A88D 21E9
+curl https://get.docker.io/gpg | apt-key add -
+
+# Add the Docker repository to your apt sources list.
+echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
+
+# upgrade to latest packages
+apt-get update
+apt-get dist-upgrade -yq
+
+# install required packages
+apt-get install lxc-docker git make python-setuptools python-pip -yq
+
+# create buildstep docker image
+git clone https://github.com/opdemand/buildstep.git
+cd buildstep
+git checkout deis
+make
+cd ..
+rm -rf buildstep
+
+# install chef 11.x deps
+apt-get install -yq ruby1.9.1 ruby1.9.1-dev make
+update-alternatives --set ruby /usr/bin/ruby1.9.1
+update-alternatives --set gem /usr/bin/gem1.9.1
+
+# install mDNS support
+apt-get install avahi-daemon -yq
+
+# clean and remove old packages
+apt-get clean
+apt-get autoremove -yq
+
+# reset cloud-init
+rm -rf /var/lib/cloud
+
+# purge SSH authorized keys
+# rm -f /home/ubuntu/.ssh/authorized_keys
+rm -f /root/.ssh/authorized_keys
+
+# ssh host keys are automatically regenerated
+# on system boot by ubuntu cloud init
+
+# purge /var/log
+find /var/log -type f | xargs rm
+
+# Removing leftover leases and persistent rules
+rm -f /var/lib/dhcp3/*
+
+# Make sure Udev doesn't block our network, see: http://6.ptmc.org/?p=164
+rm /etc/udev/rules.d/70-persistent-net.rules
+mkdir /etc/udev/rules.d/70-persistent-net.rules
+rm -rf /dev/.udev/
+rm /lib/udev/rules.d/75-persistent-net-generator.rules
+
+# flush writes to block storage
+sync
+
+# Zero out the free space to save space in the final image
+dd if=/dev/zero of=/EMPTY bs=1M
+rm -f /EMPTY

contrib/vagrant/prepare-ubuntu-box.sh

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+function echo_color {
+  echo -e "\033[1m$1\033[0m"
+}
+
+THIS_DIR=$(cd $(dirname $0); pwd) # absolute path
+CONTRIB_DIR=$(dirname $THIS_DIR)
+
+# check for Deis' general dependencies
+if ! $CONTRIB_DIR/check-deis-deps.sh; then
+  echo 'Deis is missing some dependencies.'
+  exit 1
+fi
+
+#################
+# chef settings #
+#################
+node_name=deis-controller
+run_list="recipe[deis::controller]"
+chef_version=11.4.4
+
+################
+# SSH settings #
+################
+ssh_key_path=~/.vagrant.d/insecure_private_key
+ssh_user="vagrant"
+ssh_port="22"
+
+# create data bags
+knife data bag create deis-users 2>/dev/null
+knife data bag create deis-formations 2>/dev/null
+knife data bag create deis-apps 2>/dev/null
+
+# start a controller and two nodes through vagrant
+vagrant up --provider virtualbox --parallel
+
+# trigger vagrant instance bootstrap
+echo_color "Provisioning $node_name with knife..."
+set -x
+knife bootstrap 192.168.61.100 \
+ --bootstrap-version $chef_version \
+ --ssh-user $ssh_user \
+ --ssh-port $ssh_port \
+ --identity-file $ssh_key_path \
+ --node-name $node_name \
+ --run-list $run_list \
+ --sudo
+set +x