Changes to Vagrant provisioner and environment to accomodate new

containerisation architecture.

Major changes include:

* Provisioning is done entirely with `vagrant up`. This has not been
easy and feels inelegant. Vagrant modifies the GEM_PATH env variable
meaning that it has to be saved and injected into subsequent `knife`
commands.

* Vagrantfile.local's symlinking magic is no longer needed

* DB reset now uses JSON fixtures rather than SQL.

* New ./dshell script for conveniently getting a terminal in a
container.

* There is an accompanying change in the cookbook which causes the
docker daemon service to delay its init until after the upstart
'vagrant-mounted' event has been triggered.

Updated readme to state correct username and pass created by DB reset
script.

USe new name for Vagrant Box to force downloading new box. Other bug
fixes.

Make code that gets user's default shell OSX compatible.

Use much simpler ENV['SHELL'] to get user's shell in Vagrantfile

Added script to install dev dependencies in deis-server. Used to run tests.

Install requirements.txt and dev_requirements.txt for Travis CI

Don't save user's original GEM env, just delete vagrant's GEM env from the ruby ENV var

Added global 'dsh' shortcut for dshell and documented it

Fixes in _post_chef_run.sh

Replace pty with IO.popen for osx compatibility

Revert to capturing pre-vagrant gem env so that shelling to bundle-based commands work

Revert to using provision_controller.sh. Moved Vagrantfile out of root. WIP for @bacongobbler to test.

Author: tombh

.gitignore

@@ -59,10 +59,4 @@ Vagrantfile.local
 contrib/vagrant/knife-config/admin.pem
 contrib/vagrant/knife-config/chef-validator.pem
 contrib/vagrant/nodes/
-
-# Broken symlinks that appear when mounting the codebase onto a vagrant VM
-# See Vagrantfile.local.example
-logs
-venv
-static
-!static/
+contrib/vagrant/.host_nodes_dir

.travis.yml

@@ -20,6 +20,7 @@ before_install:
   - sudo apt-get install -qq libpq-dev
 
 install:
+  - pip install -r requirements.txt coveralls
   - pip install -r dev_requirements.txt coveralls
 
 before_script:

Vagrantfile

@@ -0,0 +1,130 @@
+[
+{
+    "pk": -1, 
+    "model": "auth.user", 
+    "fields": {
+        "username": "AnonymousUser", 
+        "first_name": "", 
+        "last_name": "", 
+        "is_active": true, 
+        "is_superuser": false, 
+        "is_staff": false, 
+        "last_login": "2014-02-16T13:13:47.539Z", 
+        "groups": [], 
+        "user_permissions": [], 
+        "password": "", 
+        "email": "", 
+        "date_joined": "2014-02-16T13:13:47.539Z"
+    }
+},
+{
+    "pk": 1, 
+    "model": "auth.user", 
+    "fields": {
+        "username": "devuser", 
+        "first_name": "", 
+        "last_name": "", 
+        "is_active": true, 
+        "is_superuser": true, 
+        "is_staff": true, 
+        "last_login": "2014-01-27T23:30:25.062Z", 
+        "groups": [], 
+        "user_permissions": [], 
+        "password": "pbkdf2_sha256$12000$sGISfpN866YM$+pWXpirYh4rSfa0XX9kxvH047GTycDa8U9axRLHuJhk=", 
+        "email": "dev@dev.com", 
+        "date_joined": "2014-01-27T22:23:49.793Z"
+    }
+},
+{
+    "pk": 1, 
+    "model": "sites.site", 
+    "fields": {
+        "domain": "deis-controller.local", 
+        "name": "deis-controller.local"
+    }
+},
+{
+    "pk": "1ef7e631-79e9-40f5-9702-e2edeab2d066", 
+    "model": "api.provider", 
+    "fields": {
+        "updated": "2014-01-27T22:45:55.145Z", 
+        "created": "2014-01-27T22:23:49.861Z", 
+        "owner": [
+            "devuser"
+        ], 
+        "type": "vagrant", 
+        "id": "vagrant", 
+        "creds": "{}"
+    }
+},
+{
+    "pk": "74ae11e2-6080-4817-934b-826d85418ce8", 
+    "model": "api.provider", 
+    "fields": {
+        "updated": "2014-01-27T22:23:49.857Z", 
+        "created": "2014-01-27T22:23:49.857Z", 
+        "owner": [
+            "devuser"
+        ], 
+        "type": "static", 
+        "id": "static", 
+        "creds": "{}"
+    }
+},
+{
+    "pk": "4b65ecb5-3c05-4d9b-9efa-e6b8195099ce", 
+    "model": "api.flavor", 
+    "fields": {
+        "updated": "2014-01-27T22:23:52.079Z", 
+        "created": "2014-01-27T22:23:52.078Z", 
+        "params": "{\"memory\": \"512\"}", 
+        "provider": "1ef7e631-79e9-40f5-9702-e2edeab2d066", 
+        "owner": [
+            "devuser"
+        ], 
+        "id": "vagrant-512"
+    }
+},
+{
+    "pk": "e62447cb-c08d-4e79-b3a4-ad19e52ad616", 
+    "model": "api.flavor", 
+    "fields": {
+        "updated": "2014-01-27T22:23:52.092Z", 
+        "created": "2014-01-27T22:23:52.092Z", 
+        "params": "{\"memory\": \"2048\"}", 
+        "provider": "1ef7e631-79e9-40f5-9702-e2edeab2d066", 
+        "owner": [
+            "devuser"
+        ], 
+        "id": "vagrant-2048"
+    }
+},
+{
+    "pk": "ebddfd0f-9d16-42b7-9f74-ac9ba4479234", 
+    "model": "api.flavor", 
+    "fields": {
+        "updated": "2014-01-27T22:23:52.090Z", 
+        "created": "2014-01-27T22:23:52.090Z", 
+        "params": "{\"memory\": \"1024\"}", 
+        "provider": "1ef7e631-79e9-40f5-9702-e2edeab2d066", 
+        "owner": [
+            "devuser"
+        ], 
+        "id": "vagrant-1024"
+    }
+},
+{
+    "pk": "8b196fb8-5774-4512-b3cc-569af8894a6c", 
+    "model": "api.formation", 
+    "fields": {
+        "updated": "2014-01-27T23:32:51.173Z", 
+        "created": "2014-01-27T23:32:02.148Z", 
+        "domain": "deis-controller.local", 
+        "owner": [
+            "devuser"
+        ], 
+        "nodes": "{}", 
+        "id": "dev"
+    }
+}
+]

Vagrantfile.local.example

@@ -1,36 +1,39 @@
 #!/usr/bin/env bash
 
+function echo_red {
+  echo -e "\e[00;31m$1\e[00m"
+}
+
 # check for git
 if ! which git > /dev/null; then
-  echo 'Please install git and ensure it is in your $PATH.'
+  echo_red 'Please install git and ensure it is in your $PATH.'
   exit 1
 fi
 
 # check for RubyGems and friends
 if ! which ruby > /dev/null; then
-  echo 'Please install ruby and ensure it is in your $PATH.'
+  echo_red 'Please install ruby and ensure it is in your $PATH.'
   exit 1
 fi
 if ! which gem > /dev/null; then
-  echo 'Please install RubyGems and ensure "gem" is in your $PATH.'
+  echo_red 'Please install RubyGems and ensure "gem" is in your $PATH.'
   exit 1
 fi
 if ! which bundle > /dev/null; then
-  echo 'Please install the bundler ruby gem and ensure "bundle" is in your $PATH.'
+  echo_red 'Please install the bundler ruby gem and ensure "bundle" is in your $PATH.'
   exit 1
 fi
 bundles=`bundle list | egrep 'berkshelf|chef|foodcritic|knife-' | wc -l`
 if ! [ $bundles -ge 4 ]; then
-  echo 'Please run "bundle install" for required ruby gems.'
+  echo_red 'Please run "bundle install" for required ruby gems.'
   exit 1
 fi
-
 # check for working knife
 if ! which knife > /dev/null; then
-  echo 'Please install a knife-<provider> ruby gem and ensure "knife" is in your $PATH.'
+  echo_red 'Please install a knife-<provider> ruby gem and ensure "knife" is in your $PATH.'
   exit 1
 fi
-if ! knife client list > /dev/null; then
-  echo 'Please ensure the knife.rb file is set up correctly for your Chef account.'
+if ! bundle exec knife client list > /dev/null; then
+  echo_red 'Please ensure the knife.rb file is set up correctly for your Chef account.'
   exit 1
 fi