diff options
| author | Todd Willey <todd@rubidine.com> | 2010-07-15 00:21:17 -0400 |
|---|---|---|
| committer | Todd Willey <todd@rubidine.com> | 2010-07-15 00:21:17 -0400 |
| commit | fbf23a4f5f7d10429f26b2f43d2d203a39712acd (patch) | |
| tree | e5ed888998e97d7d16bfc9d80210609a4e3d13fb /docs/getting.started.rst | |
| parent | 9ef046e77e18806264c92e90b20dc84fb2a9d369 (diff) | |
| parent | 892ca58c0642db19e57a89d7a2ae5466971249cf (diff) | |
| download | nova-fbf23a4f5f7d10429f26b2f43d2d203a39712acd.tar.gz nova-fbf23a4f5f7d10429f26b2f43d2d203a39712acd.tar.xz nova-fbf23a4f5f7d10429f26b2f43d2d203a39712acd.zip | |
fix merge errors
Diffstat (limited to 'docs/getting.started.rst')
| -rw-r--r-- | docs/getting.started.rst | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/docs/getting.started.rst b/docs/getting.started.rst index ffa396e08..55a73dd00 100644 --- a/docs/getting.started.rst +++ b/docs/getting.started.rst @@ -1,22 +1,3 @@ -.. - Copyright 2010 United States Government as represented by the - Administrator of the National Aeronautics and Space Administration. - All Rights Reserved. - - Copyright 2010 Anso Labs, LLC - - Licensed under the Apache License, Version 2.0 (the "License"); you may - not use this file except in compliance with the License. You may obtain - a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - License for the specific language governing permissions and limitations - under the License. - Getting Started with Nova ========================= @@ -62,7 +43,7 @@ Installation :: # system libraries and tools - apt-get install -y aoetools vlan + apt-get install -y aoetools vlan curl modprobe aoe # python libraries @@ -81,6 +62,7 @@ Installation # ON THE COMPUTE NODE: apt-get install -y python-libvirt apt-get install -y kpartx kvm libvirt-bin + modprobe kvm # optional packages apt-get install -y euca2ools @@ -111,7 +93,7 @@ ON CLOUD CONTROLLER location ~ /_images/.+ { root NOVA_PATH/images; - rewrite ^/_images/(.*)\$ /\$1 break; + rewrite ^/_images/(.*)$ /$1 break; } location / { @@ -128,6 +110,7 @@ ON VOLUME NODE # This creates a 1GB file to create volumes out of dd if=/dev/zero of=MY_FILE_PATH bs=100M count=10 losetup --show -f MY_FILE_PATH + # replace loop0 below with whatever losetup returns echo "--storage_dev=/dev/loop0" >> NOVA_PATH/bin/nova.conf Running |