Merge lp:~soren/nova/ppa-references into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Make sure we point to the right PPA's everywhere.

[Thierry Carrez (ttx)]

Looks good

review: Approve

[Cory Wright (corywright)]

lgtm

review: Approve

=== modified file 'doc/source/adminguide/distros/ubuntu.10.04.rst'
--- doc/source/adminguide/distros/ubuntu.10.04.rst	2010-11-12 19:12:46 +0000
+++ doc/source/adminguide/distros/ubuntu.10.04.rst	2011-01-03 09:12:24 +0000
@@ -16,13 +16,13 @@
 Step 2: Install dependencies
 ----------------------------
 
-Nova requires rabbitmq for messaging and optionally you can use redis for storing state, so install these first.
+Nova requires rabbitmq for messaging, so install that first.
 
 *Note:* You must have sudo installed to run these commands as shown here.
 
 ::
 
-    sudo apt-get install rabbitmq-server redis-server
+    sudo apt-get install rabbitmq-server
 
 
 You'll see messages starting with "Reading package lists... Done" and you must confirm by typing Y that you want to continue.
@@ -31,11 +31,10 @@
 
 ::
 
-    sudo apt-get install python-twisted
-
-    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 95C71FE2
-    sudo sh -c 'echo "deb http://ppa.launchpad.net/openstack/openstack-ppa/ubuntu lucid main" > /etc/apt/sources.list.d/openstackppa.list'
-    sudo apt-get update && sudo apt-get install python-gflags
+    sudo add-get install python-software-properties
+    sudo add-apt-repository ppa:nova-core/trunk
+    sudo apt-get update
+    sudo apt-get install python-twisted python-gflags
 
 
 Once you've done this, continue at Step 3 here: :doc:`../single.node.install`
 
=== modified file 'doc/source/adminguide/getting.started.rst'
--- doc/source/adminguide/getting.started.rst	2010-11-23 18:46:07 +0000
+++ doc/source/adminguide/getting.started.rst	2011-01-03 09:12:24 +0000
@@ -76,11 +76,11 @@
 * aoetools and vblade-persist (if you use aoe-volumes)
 
 Nova uses cutting-edge versions of many packages. There are ubuntu packages in
-the nova-core ppa.  You can use add this ppa to your sources list on an ubuntu
-machine with the following commands::
+the nova-core trunk ppa.  You can use add this ppa to your sources list on an
+ubuntu machine with the following commands::
 
   sudo apt-get install -y python-software-properties
-  sudo add-apt-repository ppa:nova-core/ppa
+  sudo add-apt-repository ppa:nova-core/trunk
 
 Recommended
 -----------
 
=== modified file 'doc/source/adminguide/multi.node.install.rst'
--- doc/source/adminguide/multi.node.install.rst	2010-12-08 17:59:37 +0000
+++ doc/source/adminguide/multi.node.install.rst	2011-01-03 09:12:24 +0000
@@ -46,12 +46,12 @@
 Step 1 Use apt-get to get the latest code
 -----------------------------------------
 
-1. Setup Nova PPA with https://launchpad.net/~nova-core/+archive/ppa.
+1. Setup Nova PPA with https://launchpad.net/~nova-core/+archive/trunk.
 
 ::
     
     sudo apt-get install python-software-properties
-    sudo add-apt-repository ppa:nova-core/ppa
+    sudo add-apt-repository ppa:nova-core/trunk
 	
 2. Run update.