banzo · June 27, 2017 14:20 · Jun 27, 2017 · Dec 11, 2014 · Dec 11, 2014 · Dec 11, 2014
diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -1,20 +1,13 @@
 # Boxing [devstack](http://docs.openstack.org/developer/devstack/) with ![Vagrant](http://www.vagrantup.com/images/logo_vagrant-81478652.png)...
 
 The simplest way is to install the latest version of [Vagrant](http://www.vagrantup.com/)
-Then just follow the instructions given by Christian Berendt in his blog entry: <http://www.cberendt.de/2014/04/an-other-vagrant-box-with-devstack-and-ubuntu-14-04/> (you might want to reduce the memory and the number of CPU's, dependent on your hardware - also, don't forget the warning about waiting for 10+ minutes once you have fired the whole thing up)
 
 ## To install a specific branch of devstack
 
-These are the steps I followed to install the icehouse branch of devstack into a Vagrant controlled VM
+These are the steps I followed to install the Newton branch of devstack into a Vagrant controlled VM
 
 ```bash
-# create directory to work in.
-mkdir DevStackIceHouse
-cd DevStackIceHouse
-# add a vagrant box
-vagrant box add trusty64 https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box
-# set up the Vagrantfile
-vagrant init trusty64
+vagrant init bento/ubuntu-16.04
 nano Vagrantfile
 ```
 Then in the resultant edit window alter the Vagrant file to be as follows:
@@ -23,7 +16,7 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "trusty64"
+  config.vm.box = "bento/ubuntu-16.04"
 
   # set up the the network
   config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
@@ -51,22 +44,9 @@ git clone git://git.openstack.org/openstack-dev/devstack && cd devstack
 ```
 Switch to the icehouse branch
 ```bash
-git checkout stable/icehouse
+git checkout stable/newton
 ```
-Create a file named `localrc` and add the following lines to it:
-```bash
-# if you want a specific distro, then uncomment the line below and add it..
-# IMAGE_URLS+=",http://cloud.fedoraproject.org/fedora-20.x86_64.qcow2"
-# I wanted ceilomter enabled, hence the following lines
-# Enable the ceilometer metering services
-enable_service ceilometer-acompute ceilometer-acentral ceilometer-anotification ceilometer-collector
-
-# Enable the ceilometer alarming services
-enable_service ceilometer-alarm-evaluator,ceilometer-alarm-notifier
 
-# Enable the ceilometer api services
-enable_service ceilometer-api
-```
 Then fire up devstack
 ```bash
 ./stack.sh

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -1,4 +1,4 @@
-# Boxing [devstack](http://docs.openstack.org/developer/devstack/_images/logo-blue.png) with ![Vagrant](http://www.vagrantup.com/images/logo_vagrant-81478652.png)...
+# Boxing [devstack](http://docs.openstack.org/developer/devstack/) with ![Vagrant](http://www.vagrantup.com/images/logo_vagrant-81478652.png)...
 
 The simplest way is to install the latest version of [Vagrant](http://www.vagrantup.com/)
 Then just follow the instructions given by Christian Berendt in his blog entry: <http://www.cberendt.de/2014/04/an-other-vagrant-box-with-devstack-and-ubuntu-14-04/> (you might want to reduce the memory and the number of CPU's, dependent on your hardware - also, don't forget the warning about waiting for 10+ minutes once you have fired the whole thing up)

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -1,4 +1,4 @@
-# Boxing ![devstack](http://docs.openstack.org/developer/devstack/_images/logo-blue.png) with ![Vagrant](http://www.vagrantup.com/images/logo_vagrant-81478652.png)...
+# Boxing [devstack](http://docs.openstack.org/developer/devstack/_images/logo-blue.png) with ![Vagrant](http://www.vagrantup.com/images/logo_vagrant-81478652.png)...
 
 The simplest way is to install the latest version of [Vagrant](http://www.vagrantup.com/)
 Then just follow the instructions given by Christian Berendt in his blog entry: <http://www.cberendt.de/2014/04/an-other-vagrant-box-with-devstack-and-ubuntu-14-04/> (you might want to reduce the memory and the number of CPU's, dependent on your hardware - also, don't forget the warning about waiting for 10+ minutes once you have fired the whole thing up)

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -1,4 +1,4 @@
-# Boxing [devstack](http://devstack.org/) with ![Vagrant](http://www.vagrantup.com/images/logo_vagrant-81478652.png)...
+# Boxing ![devstack](http://docs.openstack.org/developer/devstack/_images/logo-blue.png) with ![Vagrant](http://www.vagrantup.com/images/logo_vagrant-81478652.png)...
 
 The simplest way is to install the latest version of [Vagrant](http://www.vagrantup.com/)
 Then just follow the instructions given by Christian Berendt in his blog entry: <http://www.cberendt.de/2014/04/an-other-vagrant-box-with-devstack-and-ubuntu-14-04/> (you might want to reduce the memory and the number of CPU's, dependent on your hardware - also, don't forget the warning about waiting for 10+ minutes once you have fired the whole thing up)

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -1,4 +1,4 @@
-# Boxing [devstack](http://devstack.org/) with Vagrant...
+# Boxing [devstack](http://devstack.org/) with ![Vagrant](http://www.vagrantup.com/images/logo_vagrant-81478652.png)...
 
 The simplest way is to install the latest version of [Vagrant](http://www.vagrantup.com/)
 Then just follow the instructions given by Christian Berendt in his blog entry: <http://www.cberendt.de/2014/04/an-other-vagrant-box-with-devstack-and-ubuntu-14-04/> (you might want to reduce the memory and the number of CPU's, dependent on your hardware - also, don't forget the warning about waiting for 10+ minutes once you have fired the whole thing up)

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -105,4 +105,7 @@ chmod 600 heat_key.priv
 ```
 If you start devstack, sign in via the dashboard, then restart devstack, you might find that your browser still is associated with the old session, hence you get a big django exception when you return to the dashboard. Simply visit <http://localhost:8080/auth/logout> to clear the old session...
 
-For more on setting the conf files, see: http://hackstack.org/x/blog/2013/09/07/devstack-local-config/
+The above is a little out of date when talking about localrc.
+For more on setting the conf files, see: 
+- http://hackstack.org/x/blog/2013/09/07/devstack-local-config/
+- http://devstack.org/configuration.html
diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -103,5 +103,6 @@ And if using the command line tools, once you've sourced openrc you can generate
 nova keypair-add heat_key > heat_key.priv
 chmod 600 heat_key.priv
 ```
+If you start devstack, sign in via the dashboard, then restart devstack, you might find that your browser still is associated with the old session, hence you get a big django exception when you return to the dashboard. Simply visit <http://localhost:8080/auth/logout> to clear the old session...
 
-If you start devstack, sign in via the dashboard, then restart devstack, you might find that your browser still is associated with the old session, hence you get a big django exception when you return to the dashboard. Simply visit <http://localhost:8080/auth/logout> to clear the old session...
+For more on setting the conf files, see: http://hackstack.org/x/blog/2013/09/07/devstack-local-config/
diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -93,6 +93,10 @@ To run devstack off line, in `openrc` add the line (but note that devstack must
 ```bash
 OFFLINE=True
 ```
+To force devstack to update all of the repositories when it runs, in `openrc` add the line
+```bash
+RECLONE=yes
+```
 And if using the command line tools, once you've sourced openrc you can generate a keypair to use as follows
 ```bash
 #to generate a keypair to use...

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -53,7 +53,7 @@ Switch to the icehouse branch
 ```bash
 git checkout stable/icehouse
 ```
-Create a file named `localrc`
+Create a file named `localrc` and add the following lines to it:
 ```bash
 # if you want a specific distro, then uncomment the line below and add it..
 # IMAGE_URLS+=",http://cloud.fedoraproject.org/fedora-20.x86_64.qcow2"

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -58,7 +58,14 @@ Create a file named `localrc`
 # if you want a specific distro, then uncomment the line below and add it..
 # IMAGE_URLS+=",http://cloud.fedoraproject.org/fedora-20.x86_64.qcow2"
 # I wanted ceilomter enabled, hence the following lines
-enable_service ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-acompute,ceilometer-alarm-singleton,ceilometer-alarm-notifier
+# Enable the ceilometer metering services
+enable_service ceilometer-acompute ceilometer-acentral ceilometer-anotification ceilometer-collector
+
+# Enable the ceilometer alarming services
+enable_service ceilometer-alarm-evaluator,ceilometer-alarm-notifier
+
+# Enable the ceilometer api services
+enable_service ceilometer-api
 ```
 Then fire up devstack
 ```bash

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -93,4 +93,4 @@ nova keypair-add heat_key > heat_key.priv
 chmod 600 heat_key.priv
 ```
 
-If you start devstack, sign in via the dashboard, then restart devstack, you might find that your browser still is associated with the old session, hence you get a big django exception when you return to the dashboard. Simply visit `http://localhost:8080/auth/logout` to clear the old session...
+If you start devstack, sign in via the dashboard, then restart devstack, you might find that your browser still is associated with the old session, hence you get a big django exception when you return to the dashboard. Simply visit <http://localhost:8080/auth/logout> to clear the old session...
diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -91,4 +91,6 @@ And if using the command line tools, once you've sourced openrc you can generate
 #to generate a keypair to use...
 nova keypair-add heat_key > heat_key.priv
 chmod 600 heat_key.priv
-```
+```
+
+If you start devstack, sign in via the dashboard, then restart devstack, you might find that your browser still is associated with the old session, hence you get a big django exception when you return to the dashboard. Simply visit `http://localhost:8080/auth/logout` to clear the old session...
diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -69,12 +69,6 @@ Provide the requested passwords, etc..
 Once up, the dashboard is available from the host computer at <http://localhost:8080/>.
 Your users are 'admin' and 'demo', and the password is the one that you provided when answering the stack.sh questions...
 
-As Christian mentioned, add:
-```bash
-127.0.0.1 openstack.site
-```
-to /etc/hosts if you want to use the VNC sessions.
-
 In the VM you can source the openrc file to enable credentials for command line tools as the demo user.
 ```bash
 source ~devstack/openrc

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -37,11 +37,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
 end
 ```
-Bring the box up and ssh into it...
+Bring the VM up and ssh into it...
 ```bash
 vagrant up && vagrant ssh
 ```
-Inside the box bring it up to date and install git
+Once in the VM bring it up to date and install git
 ```bash
 sudo apt-get update && sudo apt-get -y install git
 ```
@@ -66,20 +66,20 @@ Then fire up devstack
 ```
 Provide the requested passwords, etc..
 
-Once up, you can the dashboard is available from the host computer at <http://localhost:8080/>.
-Your users are 'admin' and 'demo', and use the password that you provided when answering the stack.sh questions...
+Once up, the dashboard is available from the host computer at <http://localhost:8080/>.
+Your users are 'admin' and 'demo', and the password is the one that you provided when answering the stack.sh questions...
 
 As Christian mentioned, add:
 ```bash
 127.0.0.1 openstack.site
 ```
 to /etc/hosts if you want to use the VNC sessions.
 
-In the VM you cansource the openrc file to enable credentials for command line tools as the demo user.
+In the VM you can source the openrc file to enable credentials for command line tools as the demo user.
 ```bash
 source ~devstack/openrc
 ```
-NB: If you want to be the admin user, source with 'admin' as an argument
+NB: If you want to be the admin user on the command line, source with 'admin' as an argument
 ```bash
 source ~devstack/openrc admin
 ```

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -69,7 +69,7 @@ Provide the requested passwords, etc..
 Once up, you can the dashboard is available from the host computer at <http://localhost:8080/>.
 Your users are 'admin' and 'demo', and use the password that you provided when answering the stack.sh questions...
 
-Add:
+As Christian mentioned, add:
 ```bash
 127.0.0.1 openstack.site
 ```

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -1,7 +1,7 @@
 # Boxing [devstack](http://devstack.org/) with Vagrant...
 
 The simplest way is to install the latest version of [Vagrant](http://www.vagrantup.com/)
-Then to follow the instructions given by Christian Berendt in his blog entry: <http://www.cberendt.de/2014/04/an-other-vagrant-box-with-devstack-and-ubuntu-14-04/> (you might want to reduce the memory and the number of CPU's, dependent on your hardware - also, don't forget the warning about waiting for 10+ minutes once you have fired the whole thing up)
+Then just follow the instructions given by Christian Berendt in his blog entry: <http://www.cberendt.de/2014/04/an-other-vagrant-box-with-devstack-and-ubuntu-14-04/> (you might want to reduce the memory and the number of CPU's, dependent on your hardware - also, don't forget the warning about waiting for 10+ minutes once you have fired the whole thing up)
 
 ## To install a specific branch of devstack
 

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -5,7 +5,7 @@ Then to follow the instructions given by Christian Berendt in his blog entry: <h
 
 ## To install a specific branch of devstack
 
-These are the steps I followed to install the icehouse branch of devstack
+These are the steps I followed to install the icehouse branch of devstack into a Vagrant controlled VM
 
 ```bash
 # create directory to work in.

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -1,7 +1,7 @@
 # Boxing [devstack](http://devstack.org/) with Vagrant...
 
 The simplest way is to install the latest version of [Vagrant](http://www.vagrantup.com/)
-Then to follow the instructions given this blog entry: [Christian Berendt](http://www.cberendt.de/2014/04/an-other-vagrant-box-with-devstack-and-ubuntu-14-04/) (you might want to reduce the memory and the number of CPU's, dependent on your hardware - also, don't forget the warning about waiting for 10+ minutes once you have fired the whole thing up)
+Then to follow the instructions given by Christian Berendt in his blog entry: <http://www.cberendt.de/2014/04/an-other-vagrant-box-with-devstack-and-ubuntu-14-04/> (you might want to reduce the memory and the number of CPU's, dependent on your hardware - also, don't forget the warning about waiting for 10+ minutes once you have fired the whole thing up)
 
 ## To install a specific branch of devstack
 

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -1,7 +1,7 @@
 # Boxing [devstack](http://devstack.org/) with Vagrant...
 
 The simplest way is to install the latest version of [Vagrant](http://www.vagrantup.com/)
-Then to follow the instructions given this blog entry: [](http://www.cberendt.de/2014/04/an-other-vagrant-box-with-devstack-and-ubuntu-14-04/) (you might want to reduce the memory and the number of CPU's, dependent on your hardware - also, don't forget the warning about waiting for 10+ minutes once you have fired the whole thing up)
+Then to follow the instructions given this blog entry: [Christian Berendt](http://www.cberendt.de/2014/04/an-other-vagrant-box-with-devstack-and-ubuntu-14-04/) (you might want to reduce the memory and the number of CPU's, dependent on your hardware - also, don't forget the warning about waiting for 10+ minutes once you have fired the whole thing up)
 
 ## To install a specific branch of devstack
 

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -1,9 +1,19 @@
-To put devstack into a vagrant box...
+# Boxing [devstack](http://devstack.org/) with Vagrant...
+
+The simplest way is to install the latest version of [Vagrant](http://www.vagrantup.com/)
+Then to follow the instructions given this blog entry: [](http://www.cberendt.de/2014/04/an-other-vagrant-box-with-devstack-and-ubuntu-14-04/) (you might want to reduce the memory and the number of CPU's, dependent on your hardware - also, don't forget the warning about waiting for 10+ minutes once you have fired the whole thing up)
+
+## To install a specific branch of devstack
+
+These are the steps I followed to install the icehouse branch of devstack
 
 ```bash
+# create directory to work in.
 mkdir DevStackIceHouse
 cd DevStackIceHouse
+# add a vagrant box
 vagrant box add trusty64 https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box
+# set up the Vagrantfile
 vagrant init trusty64
 nano Vagrantfile
 ```
@@ -15,14 +25,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "trusty64"
 
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-
+  # set up the the network
   config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
   config.vm.network "forwarded_port", guest: 6080, host: 8081, host_ip: "127.0.0.1"
 
+  # and the amount of memory and cpu's to use
   config.vm.provider "virtualbox" do |vb|
       vb.customize ["modifyvm", :id, "--memory", "4096"]
       vb.customize ["modifyvm", :id, "--cpus", "2"]
@@ -46,12 +53,14 @@ Switch to the icehouse branch
 ```bash
 git checkout stable/icehouse
 ```
-create a file named `localrc`
+Create a file named `localrc`
 ```bash
-IMAGE_URLS+=",http://cloud.fedoraproject.org/fedora-20.x86_64.qcow2"
+# if you want a specific distro, then uncomment the line below and add it..
+# IMAGE_URLS+=",http://cloud.fedoraproject.org/fedora-20.x86_64.qcow2"
+# I wanted ceilomter enabled, hence the following lines
 enable_service ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-acompute,ceilometer-alarm-singleton,ceilometer-alarm-notifier
 ```
-Then fire up
+Then fire up devstack
 ```bash
 ./stack.sh
 ```
@@ -83,9 +92,9 @@ To run devstack off line, in `openrc` add the line (but note that devstack must
 ```bash
 OFFLINE=True
 ```
-
+And if using the command line tools, once you've sourced openrc you can generate a keypair to use as follows
 ```bash
 #to generate a keypair to use...
 nova keypair-add heat_key > heat_key.priv
 chmod 600 heat_key.priv
-```
+```
diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -84,3 +84,8 @@ To run devstack off line, in `openrc` add the line (but note that devstack must
 OFFLINE=True
 ```
 
+```bash
+#to generate a keypair to use...
+nova keypair-add heat_key > heat_key.priv
+chmod 600 heat_key.priv
+```
diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -46,7 +46,7 @@ Switch to the icehouse branch
 ```bash
 git checkout stable/icehouse
 ```
-create a file named localrc
+create a file named `localrc`
 ```bash
 IMAGE_URLS+=",http://cloud.fedoraproject.org/fedora-20.x86_64.qcow2"
 enable_service ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-acompute,ceilometer-alarm-singleton,ceilometer-alarm-notifier
@@ -79,7 +79,7 @@ To stop devstack,
 ./unstack.sh
 ```
 
-To run devstack off line, in `openrc` add the line
+To run devstack off line, in `openrc` add the line (but note that devstack must have been run successfully with Internet access prior to doing this)
 ```bash
 OFFLINE=True
 ```

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -79,4 +79,8 @@ To stop devstack,
 ./unstack.sh
 ```
 
+To run devstack off line, in `openrc` add the line
+```bash
+OFFLINE=True
+```
 
diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -48,6 +48,7 @@ git checkout stable/icehouse
 ```
 create a file named localrc
 ```bash
+IMAGE_URLS+=",http://cloud.fedoraproject.org/fedora-20.x86_64.qcow2"
 enable_service ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-acompute,ceilometer-alarm-singleton,ceilometer-alarm-notifier
 ```
 Then fire up

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -48,7 +48,7 @@ git checkout stable/icehouse
 ```
 create a file named localrc
 ```bash
-enable_service ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api
+enable_service ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-acompute,ceilometer-alarm-singleton,ceilometer-alarm-notifier
 ```
 Then fire up
 ```bash

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -42,9 +42,16 @@ Then fetch devstack and change into its directory...
 ```bash
 git clone git://git.openstack.org/openstack-dev/devstack && cd devstack
 ```
-Switch to the icehouse branch & fire it up
+Switch to the icehouse branch
 ```bash
 git checkout stable/icehouse
+```
+create a file named localrc
+```bash
+enable_service ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api
+```
+Then fire up
+```bash
 ./stack.sh
 ```
 Provide the requested passwords, etc..

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -49,7 +49,9 @@ git checkout stable/icehouse
 ```
 Provide the requested passwords, etc..
 
-Once up, you can the dashboard is available from the host computer at <http://localhost:8080/> . 
+Once up, you can the dashboard is available from the host computer at <http://localhost:8080/>.
+Your users are 'admin' and 'demo', and use the password that you provided when answering the stack.sh questions...
+
 Add:
 ```bash
 127.0.0.1 openstack.site

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -49,7 +49,7 @@ git checkout stable/icehouse
 ```
 Provide the requested passwords, etc..
 
-Once up, you can the dashboard is available from the host computer at http://localhost:8080/ . 
+Once up, you can the dashboard is available from the host computer at <http://localhost:8080/> . 
 Add:
 ```bash
 127.0.0.1 openstack.site

diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -28,8 +28,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       vb.customize ["modifyvm", :id, "--cpus", "2"]
   end
 
-  #config.vm.provision "shell", privileged: false, inline: "/home/vagrant/devstack/stack.sh"
-
 end
 ```
 Bring the box up and ssh into it...
@@ -44,8 +42,31 @@ Then fetch devstack and change into its directory...
 ```bash
 git clone git://git.openstack.org/openstack-dev/devstack && cd devstack
 ```
-Switch to the icehouse branch
+Switch to the icehouse branch & fire it up
+```bash
+git checkout stable/icehouse
+./stack.sh
+```
+Provide the requested passwords, etc..
+
+Once up, you can the dashboard is available from the host computer at http://localhost:8080/ . 
+Add:
+```bash
+127.0.0.1 openstack.site
+```
+to /etc/hosts if you want to use the VNC sessions.
+
+In the VM you cansource the openrc file to enable credentials for command line tools as the demo user.
+```bash
+source ~devstack/openrc
+```
+NB: If you want to be the admin user, source with 'admin' as an argument
 ```bash
-git checkout stable/diablo
+source ~devstack/openrc admin
 ```
+To stop devstack,
+```bash
+./unstack.sh
+```
+
 
diff --git a/DevstackVagrant.md b/DevstackVagrant.md
@@ -28,12 +28,24 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       vb.customize ["modifyvm", :id, "--cpus", "2"]
   end
 
-  config.vm.provision "shell", privileged: false, inline: "/home/vagrant/devstack/stack.sh"
+  #config.vm.provision "shell", privileged: false, inline: "/home/vagrant/devstack/stack.sh"
 
 end
 ```
 Bring the box up and ssh into it...
 ```bash
 vagrant up && vagrant ssh
 ```
+Inside the box bring it up to date and install git
+```bash
+sudo apt-get update && sudo apt-get -y install git
+```
+Then fetch devstack and change into its directory...
+```bash
+git clone git://git.openstack.org/openstack-dev/devstack && cd devstack
+```
+Switch to the icehouse branch
+```bash
+git checkout stable/diablo
+```