Merge pull request #374 from opdemand/localdev-docs

Local Development instructions using Vagrant

Author: mboersma

contrib/vagrant/chef-server/Vagrantfile

@@ -11,12 +11,9 @@ Vagrant.configure("2") do |config|
   # canonical address. Another way of changing the API's hostname is through
   # chef-server.rb - http://docs.opscode.com/config_rb_chef_server.html
   config.vm.host_name = "chefserver.local"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network. IP will be fetched via DCHP and associated to 'chefserver.local'
-  # using avahi-daemon
-  config.vm.network :public_network
+  
+  # IP will be associated to 'chefserver.local' using avahi-daemon
+  config.vm.network :private_network, ip: "192.168.61.99"  
 
   # Chef Server requires at least 1G of RAM to install.
   # You may be able to run it with less once it's installed.

docs/components/controller.rst

@@ -31,5 +31,5 @@ The controller stack includes:
 * Gitosis to handle access control for Git Push over SSH
 * Docker and Buildstep to process Heroku Buildpacks
 
-Follow the :ref:`Installation` process to setup your own private
+Follow the :ref:`Operations Guide <operations>` to setup your own private
 Deis controller.

docs/contributing/devsetup.rst

@@ -12,7 +12,7 @@ Contributing
     :maxdepth: 1
 
     overview
-    devsetup
+    localdev
     standards
     community
     conduct