Merge pull request #623 from tscheepers/patch-1

Updated vagrant readme

Author: Matthew Fisher

contrib/vagrant/README.md

@@ -28,6 +28,7 @@ bear in mind that a local Chef Server VM will take up at least 1GB of RAM.
     interface and has more features, like being able to add clients to permission groups.
 
 3. Now you can follow the standard deis setup:
+  * If you're running a local chef server, you should adjust the `Gemfile` and make sure the version of berkshelf is 3.0.x. This is needed for the `--ssl-verify` option to work correctly.
   ```bash
   bundle install # Installs gem files like the knife tool
   berks install # Downloads the relevant cookbooks

contrib/vagrant/chef-server/Vagrantfile

@@ -27,6 +27,8 @@ Vagrant.configure("2") do |config|
       sudo aptitude install avahi-daemon avahi-discover libnss-mdns -y
       sudo wget https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chef-server_11.0.8-1.ubuntu.12.04_amd64.deb
       sudo dpkg -i chef-server_11.0.8-1.ubuntu.12.04_amd64.deb
+      sudo hostname 'chefserver.local'
+      echo "chefserver.local" | sudo tee /etc/hostname
       sudo chef-server-ctl reconfigure
       sudo chef-server-ctl test # Optional
     fi