Merge branch 'master' into vpnredis

Conflicts:
	nova/auth/users.py

2 files changed, 5 insertions, 22 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 9dfdfc8be..bc61f438c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -16,7 +16,7 @@ import sys, os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.append(os.path.abspath('.'))
+sys.path.append(os.path.abspath('/Users/jmckenty/Projects/cc'))
 sys.path.append([os.path.abspath('../nova'),os.path.abspath('../'),os.path.abspath('../vendor')])
 from nova import vendor
 
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