OpenStack Compute (nova)

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

  1. ppa-references
  2. Merge into trunk
Proposed by Soren Hansen
Status: Merged
Approved by: Cory Wright
Approved revision: 510
Merged at revision: 514
Proposed branch: lp:~soren/nova/ppa-references
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 72 lines (+11/-12)
3 files modified
doc/source/adminguide/distros/ubuntu.10.04.rst (+6/-7)
doc/source/adminguide/getting.started.rst (+3/-3)
doc/source/adminguide/multi.node.install.rst (+2/-2)
To merge this branch: bzr merge lp:~soren/nova/ppa-references
Reviewer Review Type Date Requested Status
Cory Wright (community) Approve
Thierry Carrez (community) Approve
Review via email: mp+45019@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Thierry Carrez (ttx) wrote :

Looks good

review: Approve
Revision history for this message
Cory Wright (corywright) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/source/adminguide/distros/ubuntu.10.04.rst'
2--- doc/source/adminguide/distros/ubuntu.10.04.rst 2010-11-12 19:12:46 +0000
3+++ doc/source/adminguide/distros/ubuntu.10.04.rst 2011-01-03 09:12:24 +0000
4@@ -16,13 +16,13 @@
5 Step 2: Install dependencies
6 ----------------------------
7
8-Nova requires rabbitmq for messaging and optionally you can use redis for storing state, so install these first.
9+Nova requires rabbitmq for messaging, so install that first.
10
11 *Note:* You must have sudo installed to run these commands as shown here.
12
13 ::
14
15- sudo apt-get install rabbitmq-server redis-server
16+ sudo apt-get install rabbitmq-server
17
18
19 You'll see messages starting with "Reading package lists... Done" and you must confirm by typing Y that you want to continue.
20@@ -31,11 +31,10 @@
21
22 ::
23
24- sudo apt-get install python-twisted
25-
26- sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 95C71FE2
27- sudo sh -c 'echo "deb http://ppa.launchpad.net/openstack/openstack-ppa/ubuntu lucid main" > /etc/apt/sources.list.d/openstackppa.list'
28- sudo apt-get update && sudo apt-get install python-gflags
29+ sudo add-get install python-software-properties
30+ sudo add-apt-repository ppa:nova-core/trunk
31+ sudo apt-get update
32+ sudo apt-get install python-twisted python-gflags
33
34
35 Once you've done this, continue at Step 3 here: :doc:`../single.node.install`
36
37=== modified file 'doc/source/adminguide/getting.started.rst'
38--- doc/source/adminguide/getting.started.rst 2010-11-23 18:46:07 +0000
39+++ doc/source/adminguide/getting.started.rst 2011-01-03 09:12:24 +0000
40@@ -76,11 +76,11 @@
41 * aoetools and vblade-persist (if you use aoe-volumes)
42
43 Nova uses cutting-edge versions of many packages. There are ubuntu packages in
44-the nova-core ppa. You can use add this ppa to your sources list on an ubuntu
45-machine with the following commands::
46+the nova-core trunk ppa. You can use add this ppa to your sources list on an
47+ubuntu machine with the following commands::
48
49 sudo apt-get install -y python-software-properties
50- sudo add-apt-repository ppa:nova-core/ppa
51+ sudo add-apt-repository ppa:nova-core/trunk
52
53 Recommended
54 -----------
55
56=== modified file 'doc/source/adminguide/multi.node.install.rst'
57--- doc/source/adminguide/multi.node.install.rst 2010-12-08 17:59:37 +0000
58+++ doc/source/adminguide/multi.node.install.rst 2011-01-03 09:12:24 +0000
59@@ -46,12 +46,12 @@
60 Step 1 Use apt-get to get the latest code
61 -----------------------------------------
62
63-1. Setup Nova PPA with https://launchpad.net/~nova-core/+archive/ppa.
64+1. Setup Nova PPA with https://launchpad.net/~nova-core/+archive/trunk.
65
66 ::
67
68 sudo apt-get install python-software-properties
69- sudo add-apt-repository ppa:nova-core/ppa
70+ sudo add-apt-repository ppa:nova-core/trunk
71
72 2. Run update.
73