Merge pull request #2602 from aledbf/check_discovery-url

feat(vagrant): check if discovery url is defined

Author: Matthew Fisher

Vagrantfile

@@ -5,6 +5,10 @@ require 'fileutils'
 
 Vagrant.require_version ">= 1.6.5"
 
+unless Vagrant.has_plugin?("vagrant-triggers")
+  raise Vagrant::Errors::VagrantError.new, "Please install the vagrant-triggers plugin running 'vagrant plugin install vagrant-triggers'"
+end
+
 CLOUD_CONFIG_PATH = File.join(File.dirname(__FILE__), "contrib", "coreos", "user-data")
 CONFIG = File.join(File.dirname(__FILE__), "config.rb")
 
@@ -66,6 +70,12 @@ Vagrant.configure("2") do |config|
     config.vbguest.auto_update = false
   end
 
+  config.trigger.before :up do
+    if !File.exists?(CLOUD_CONFIG_PATH) || File.readlines(CLOUD_CONFIG_PATH).grep(/#\s*discovery:/).any?
+      raise Vagrant::Errors::VagrantError.new, "Run 'make discovery-url' first to create user-data."
+    end
+  end
+
   (1..$num_instances).each do |i|
     config.vm.define vm_name = "deis-%d" % i do |config|
       config.vm.hostname = vm_name

docs/installing_deis/vagrant.rst

@@ -18,6 +18,12 @@ Install Prerequisites
 
 Please install `Vagrant`_ v1.6.5+ and `VirtualBox`_.
 
+The ``Vagrantfile`` requires the plugin `vagrant-triggers`_. To install the plugin run:
+
+.. code-block:: console
+
+    $ vagrant plugin install vagrant-triggers
+
 .. note::
 
     For Ubuntu users: the VirtualBox package in Ubuntu has some issues when running in
@@ -78,3 +84,4 @@ start installing the platform.
 
 .. _Vagrant: http://www.vagrantup.com/
 .. _VirtualBox: https://www.virtualbox.org/wiki/Downloads
+.. _vagrant-triggers: https://github.com/emyl/vagrant-triggers