Merge lp:~annegentle/nova/fixnewscript into lp:~hudson-openstack/nova/trunk

[Anne Gentle]

Had to abandon the other branch (~annegentle/nova/newscript) because the diffs weren't working right for me. This is a fresh branch that should be merged correctly with trunk. Thanks for your patience. :)

[lp:~annegentle/nova/fixnewscript]

480. By Anne Gentle on 2011-01-04

Change all 2010 Copyright statements to 2010-2011 in doc source directory only

481. By Anne Gentle on 2011-01-05

Fixing formatting problems with multinode install document

[Vish Ishaya (vishvananda)]

lgtm. Going to mark the other branch rejected so it stops showing up.

review: Approve

[Anne Gentle (annegentle)]

Oh thank you - I wasn't sure how to do that correctly.

On Wed, Jan 5, 2011 at 6:04 PM, Vish Ishaya <email address hidden> wrote:

> Review: Approve
> lgtm. Going to mark the other branch rejected so it stops showing up.
> --
> https://code.launchpad.net/~annegentle/nova/fixnewscript/+merge/45085<https://code.launchpad.net/%7Eannegentle/nova/fixnewscript/+merge/45085>
> You are the owner of lp:~annegentle/nova/fixnewscript.
>

[Devin Carlen (devcamcar)]

approve

review: Approve

[Thierry Carrez (ttx)]

Looks like this combines two things: the newscript and some doc fixes. It would be better to have two separate branch merge proposals, since the doc fixes are no-brainers, while some people (including me) are not yet convinced another installation script should be made part of the core code.

[lp:~annegentle/nova/fixnewscript]

482. By Anne Gentle on 2011-01-07

Fixing unescaped quote in nova-CC-install.sh script plus formatting fixes to multinode install

483. By Anne Gentle on 2011-01-07

Merged with trunk

484. By Anne Gentle on 2011-01-11

Removing script file

[Anne Gentle (annegentle)]

Removing the script to separate the doc and script. We'll place the script on github similar to Vish's dev script's first holding spot.

[Thierry Carrez (ttx)]

lgtm

review: Approve

=== modified file 'README'
--- README	2010-07-24 23:22:17 +0000
+++ README	2011-01-11 22:27:12 +0000
@@ -1,7 +1,7 @@
 The Choose Your Own Adventure README for Nova:
 
   You have come across a cloud computing fabric controller.  It has identified
-  itself as "Nova."  It is apparent that it maintains compatability with
+  itself as "Nova."  It is apparent that it maintains compatibility with
   the popular Amazon EC2 and S3 APIs.
 
 To monitor it from a distance: follow @novacc on twitter
@@ -10,7 +10,7 @@
 
 To study its anatomy: read http://nova.openstack.org/architecture.html
 
-To disect it in detail: visit http://code.launchpad.net/nova
+To dissect it in detail: visit http://code.launchpad.net/nova
 
 To taunt it with its weaknesses: use http://bugs.launchpad.net/nova
 
 
=== modified file 'doc/source/adminguide/binaries.rst'
--- doc/source/adminguide/binaries.rst	2010-11-09 04:38:21 +0000
+++ doc/source/adminguide/binaries.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
 
=== modified file 'doc/source/adminguide/flags.rst'
--- doc/source/adminguide/flags.rst	2010-11-04 23:00:46 +0000
+++ doc/source/adminguide/flags.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/adminguide/getting.started.rst'
--- doc/source/adminguide/getting.started.rst	2011-01-03 09:08:32 +0000
+++ doc/source/adminguide/getting.started.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
 
=== modified file 'doc/source/adminguide/index.rst'
--- doc/source/adminguide/index.rst	2010-11-22 22:43:17 +0000
+++ doc/source/adminguide/index.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
 
=== modified file 'doc/source/adminguide/managing.images.rst'
--- doc/source/adminguide/managing.images.rst	2010-11-09 02:40:21 +0000
+++ doc/source/adminguide/managing.images.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
 
=== modified file 'doc/source/adminguide/managing.instances.rst'
--- doc/source/adminguide/managing.instances.rst	2010-11-09 04:38:21 +0000
+++ doc/source/adminguide/managing.instances.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
 
=== modified file 'doc/source/adminguide/managing.networks.rst'
--- doc/source/adminguide/managing.networks.rst	2010-12-07 22:48:42 +0000
+++ doc/source/adminguide/managing.networks.rst	2011-01-11 22:27:12 +0000
@@ -1,7 +1,7 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
-      Overview Sections Copyright 2010 Citrix 
+      Overview Sections Copyright 2010-2011 Citrix 
       All Rights Reserved.
 
       Licensed under the Apache License, Version 2.0 (the "License"); you may
 
=== modified file 'doc/source/adminguide/managing.projects.rst'
--- doc/source/adminguide/managing.projects.rst	2010-11-09 04:38:21 +0000
+++ doc/source/adminguide/managing.projects.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
 
=== modified file 'doc/source/adminguide/managingsecurity.rst'
--- doc/source/adminguide/managingsecurity.rst	2010-11-11 22:32:24 +0000
+++ doc/source/adminguide/managingsecurity.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/adminguide/monitoring.rst'
--- doc/source/adminguide/monitoring.rst	2010-11-04 23:00:46 +0000
+++ doc/source/adminguide/monitoring.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/adminguide/multi.node.install.rst'
--- doc/source/adminguide/multi.node.install.rst	2011-01-03 21:34:44 +0000
+++ doc/source/adminguide/multi.node.install.rst	2011-01-11 22:27:12 +0000
@@ -1,6 +1,7 @@
 ..
-      Copyright 2010 United States Government as represented by the
-      Administrator of the National Aeronautics and Space Administration. 
+      Copyright 2010-2011 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration.
+
       All Rights Reserved.
 
       Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -17,36 +18,35 @@
 
 Installing Nova on Multiple Servers
 ===================================
-
+ 
 When you move beyond evaluating the technology and into building an actual
 production environment, you will need to know how to configure your datacenter
 and how to deploy components across your clusters.  This guide should help you
 through that process.
-
+ 
 You can install multiple nodes to increase performance and availability of the OpenStack Compute installation.
-
+ 
 This setup is based on an Ubuntu Lucid 10.04 installation with the latest updates. Most of this works around issues that need to be resolved in the installation and configuration scripts as of October 18th 2010. It also needs to eventually be generalized, but the intent here is to get the multi-node configuration bootstrapped so folks can move forward.
-
-
+ 
+ 
 Requirements for a multi-node installation
 ------------------------------------------
-
+ 
 * You need a real database, compatible with SQLAlchemy (mysql, postgresql) There's not a specific reason to choose one over another, it basically depends what you know. MySQL is easier to do High Availability (HA) with, but people may already know Postgres. We should document both configurations, though.
 * For a recommended HA setup, consider a MySQL master/slave replication, with as many slaves as you like, and probably a heartbeat to kick one of the slaves into being a master if it dies.
 * For performance optimization, split reads and writes to the database. MySQL proxy is the easiest way to make this work if running MySQL.
-
+ 
 Assumptions
-^^^^^^^^^^^
-
+-----------
+ 
 * Networking is configured between/through the physical machines on a single subnet.
-* Installation and execution are both performed by root user.
-
-
-
-Step 1 Use apt-get to get the latest code
------------------------------------------
-
-1. Setup Nova PPA with https://launchpad.net/~nova-core/+archive/trunk.
+* Installation and execution are both performed by ROOT user.
+  
+ 
+Step 1 - Use apt-get to get the latest code
+-------------------------------------------
+
+1. Setup Nova PPA with https://launchpad.net/~nova-core/+archive/trunk. The ‘python-software-properties’ package is a pre-requisite for setting up the nova package repo:
 
 ::
     
@@ -69,201 +69,260 @@
 It is highly likely that there will be errors when the nova services come up since they are not yet configured. Don't worry, you're only at step 1!
 
 Step 2 Setup configuration file (installed in /etc/nova)
----------------------------------------------------------
+--------------------------------------------------------
+
+1.  Nova development has consolidated all config files to nova.conf as of November 2010.   There is a default set of options that are already configured in nova.conf:
+ 
+::
+ 
+--daemonize=1
+--dhcpbridge_flagfile=/etc/nova/nova.conf
+--dhcpbridge=/usr/bin/nova-dhcpbridge
+--logdir=/var/log/nova
+--state_path=/var/lib/nova
+ 
+The following items ALSO need to be defined in /etc/nova/nova.conf.  I’ve added some explanation of the variables, as comments CANNOT be in nova.conf.  There seems to be an issue with nova-manage not processing the comments/whitespace correctly:
+
+--sql_connection ###  Location of Nova SQL DB
+
+--s3_host ###  This is where Nova is hosting the objectstore service, which will contain the VM images and buckets
+
+--rabbit_host ### This is where the rabbit AMQP messaging service is hosted
+
+--cc_host ### This is where the the nova-api service lives
+
+--verbose ###  Optional but very helpful during initial setup
+
+--ec2_url ### The location to interface nova-api
+
+--network_manager ### Many options here, discussed below.  This is how your controller will communicate with additional Nova nodes and VMs:
+
+nova.network.manager.FlatManager # Simple, no-vlan networking type
+nova.network.manager. FlatDHCPManager #  Flat networking with DHCP
+nova.network.manager.VlanManager # Vlan networking with DHCP – /DEFAULT/ if no network manager is defined in nova.conf
+
+--fixed_range=<network/prefix> ###  This will be the IP network that ALL the projects for future VM guests will reside on.  E.g. 192.168.0.0/12
+
+--network_size=<# of addrs> ### This is the total number of IP Addrs to use for VM guests, of all projects.  E.g. 5000
+
+The following code can be cut and paste, and edited to your setup:
 
 Note: CC_ADDR=<the external IP address of your cloud controller>
 
-Nova development has consolidated all .conf files to nova.conf as of November 2010. References to specific .conf files may be ignored.
-
-#. These need to be defined in the nova.conf configuration file::
-
-        --sql_connection=mysql://root:nova@$CC_ADDR/nova # location of nova sql db
-        --s3_host=$CC_ADDR  # This is where Nova is hosting the objectstore service, which
-                            # will contain the VM images and buckets
-        --rabbit_host=$CC_ADDR # This is where the rabbit AMQP messaging service is hosted
-        --cc_host=$CC_ADDR     # This is where the the nova-api service lives
-        --verbose              # Optional but very helpful during initial setup
-        --ec2_url=http://$CC_ADDR:8773/services/Cloud
-        --network_manager=nova.network.manager.FlatManager # simple, no-vlan networking type
-        --fixed_range=<network/prefix>   # ip network to use for VM guests, ex 192.168.2.64/26
-        --network_size=<# of addrs>      # number of ip addrs to use for VM guests, ex 64
-
-#. Create a nova group::
-
-        sudo addgroup nova
-
-The Nova config file should have its owner set to root:nova, and mode set to 0640, since they contain your MySQL server's root password.
-
-::
-
-   cd /etc/nova
-   chown -R root:nova .
-
-Step 3 Setup the sql db
------------------------
-
-1. First you 'preseed' (using the Quick Start method :doc:`../quickstart`). Run this as root.
-
-::
-
-   sudo apt-get install bzr git-core
-   sudo bash
-   export MYSQL_PASS=nova
-
-
-::
-
-   cat <<MYSQL_PRESEED | debconf-set-selections
-   mysql-server-5.1 mysql-server/root_password password $MYSQL_PASS
-   mysql-server-5.1 mysql-server/root_password_again password $MYSQL_PASS
-   mysql-server-5.1 mysql-server/start_on_boot boolean true
-   MYSQL_PRESEED
-
-2. Install mysql
-
-::
-
-   sudo apt-get install -y mysql-server
-
-4. Edit /etc/mysql/my.cnf and set this line: bind-address=0.0.0.0 and then sighup or restart mysql
-
-5. create nova's db   
-
-::
-
-   mysql -uroot -pnova -e 'CREATE DATABASE nova;'
-
-
-6. Update the db to include user 'root'@'%'
-
-::
-
-   mysql -u root -p nova 
-   GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
-   SET PASSWORD FOR 'root'@'%' = PASSWORD('nova');
-
-7. Branch and install Nova
-
-::
-
-   sudo -i
-   cd ~
-   export USE_MYSQL=1
-   export MYSQL_PASS=nova
-   git clone https://github.com/vishvananda/novascript.git
-   cd novascript
-   ./nova.sh branch
-   ./nova.sh install
-   ./nova.sh run
-
-Step 4 Setup Nova environment
------------------------------
-
-::
-
-   /usr/bin/python /usr/bin/nova-manage user admin <user_name>
-   /usr/bin/python /usr/bin/nova-manage project create <project_name> <user_name>
-   /usr/bin/python /usr/bin/nova-manage project create network
-
-Note: The nova-manage service assumes that the first IP address is your network (like 192.168.0.0), that the 2nd IP is your gateway (192.168.0.1), and that the broadcast is the very last IP in the range you defined (192.168.0.255). If this is not the case you will need to manually edit the sql db 'networks' table.o.
-
-On running this command, entries are made in the 'networks' and 'fixed_ips' table. However, one of the networks listed in the 'networks' table needs to be marked as bridge in order for the code to know that a bridge exists. The Network is marked as bridged automatically based on the type of network manager selected.
-
-More networking details to create a network bridge for flat network
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Nova defaults to a bridge device named 'br100'. This needs to be created and somehow integrated into YOUR network. In my case, I wanted to keep things as simple as possible and have all the vm guests on the same network as the vm hosts (the compute nodes). Thus, I set the compute node's external IP address to be on the bridge and added eth0 to that bridge. To do this, edit your network interfaces config to look like the following::
+Detailed explanation of the following example is available above.
+ 
+::
+ 
+--sql_connection=mysql://root:nova@<CC_ADDR>/nova
+--s3_host=<CC_ADDR>
+--rabbit_host=<CC_ADDR>
+--cc_host=<CC_ADDR>  
+--verbose             
+--ec2_url=http://<CC_ADDR>:8773/services/Cloud
+--network_manager=nova.network.manager.VlanManager
+--fixed_range=<network/prefix>
+--network_size=<# of addrs>     
+ 
+2. Create a “nova” group, and set permissions::
+
+    addgroup nova
+ 
+The Nova config file should have its owner set to root:nova, and mode set to 0644, since they contain your MySQL server's root password. ::
+
+    chown -R root:nova /etc/nova
+    chmod 644 /etc/nova/nova.conf
+ 
+Step 3 - Setup the SQL DB (MySQL for this setup)
+------------------------------------------------
+ 
+1. First you 'preseed' to bypass all the installation prompts::
+
+    bash
+    MYSQL_PASS=nova
+    cat <<MYSQL_PRESEED | debconf-set-selections
+    mysql-server-5.1 mysql-server/root_password password $MYSQL_PASS
+    mysql-server-5.1 mysql-server/root_password_again password $MYSQL_PASS
+    mysql-server-5.1 mysql-server/start_on_boot boolean true
+    MYSQL_PRESEED
+ 
+2. Install MySQL::
+ 
+    apt-get install -y mysql-server
+ 
+3. Edit /etc/mysql/my.cnf to change ‘bind-address’ from localhost to any::
+
+    sed -i 's/127.0.0.1/0.0.0.0/g' /etc/mysql/my.cnf
+    service mysql restart
+ 
+3.  Network Configuration
+ 
+If you use FlatManager (as opposed to VlanManager that we set) as your network manager, there are some additional networking changes you’ll have to make to ensure connectivity between your nodes and VMs.  If you chose VlanManager or FlatDHCP, you may skip this section, as it’s set up for you automatically.
+ 
+Nova defaults to a bridge device named 'br100'. This needs to be created and somehow integrated into YOUR network. To keep things as simple as possible, have all the VM guests on the same network as the VM hosts (the compute nodes). To do so, set the compute node's external IP address to be on the bridge and add eth0 to that bridge. To do this, edit your network interfaces config to look like the following::
 
    < begin /etc/network/interfaces >
    # The loopback network interface
    auto lo
    iface lo inet loopback
-
+ 
    # Networking for NOVA
    auto br100
-
+ 
    iface br100 inet dhcp
           bridge_ports    eth0
           bridge_stp      off
           bridge_maxwait  0
           bridge_fd       0
    < end /etc/network/interfaces >
-
-
+ 
 Next, restart networking to apply the changes::
-
-   sudo /etc/init.d/networking restart
-
-Step 5: Create nova certs.
---------------------------
-
-Generate the certs as a zip file::
-
-   mkdir creds
-   sudo /usr/bin/python /usr/bin/nova-manage project zip admin admin creds/nova.zip
-
-you can get the rc file more easily with::
-
-   sudo /usr/bin/python /usr/bin/nova-manage project env admin admin creds/novarc 
-
-unzip them in your home directory, and add them to your environment::
-
-   unzip creds/nova.zip
-   echo ". creds/novarc" >> ~/.bashrc
-   ~/.bashrc
-
-Step 6 Restart all relevant services
-------------------------------------
-
-Restart Libvirt::
-
-   sudo /etc/init.d/libvirt-bin restart
-
-Restart relevant nova services::
-
-   sudo /etc/init.d/nova-compute restart
-   sudo /etc/init.d/nova-volume restart
-
-
-.. todo:: do we still need the content below?
-
-Bare-metal Provisioning Notes
------------------------------
-
-To install the base operating system you can use PXE booting.
-
-Types of Hosts
---------------
-
-A single machine in your cluster can act as one or more of the following types
-of host:
-
-Nova Services
-
-* Network
-* Compute
-* Volume
-* API
-* Objectstore
-
-Other supporting services
-
-* Message Queue
-* Database (optional)
-* Authentication database (optional)
-
-Initial Setup
--------------
-
-* Networking
-* Cloudadmin User Creation
-
-Deployment Technologies
------------------------
-
-Once you have machines with a base operating system installation, you can deploy
-code and configuration with your favorite tools to specify which machines in
-your cluster have which roles:
-
-* Puppet
-* Chef
+ 
+    sudo /etc/init.d/networking restart
+
+4. MySQL DB configuration:
+ 
+Create NOVA database::
+
+    mysql -uroot -p$MYSQL_PASS -e 'CREATE DATABASE nova;'
+ 
+Update the DB to include user 'root'@'%' with super user privileges::
+
+    mysql -uroot -p$MYSQL_PASS -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;"
+ 
+Set mySQL root password::
+
+    mysql -uroot -p$MYSQL_PASS -e "SET PASSWORD FOR 'root'@'%' = PASSWORD('$MYSQL_PASS');"
+ 
+Step 4 - Setup Nova environment
+-------------------------------
+
+These are the commands you run to set up a user and project::
+
+    /usr/bin/python /usr/bin/nova-manage user admin <user_name>
+    /usr/bin/python /usr/bin/nova-manage project create <project_name> <user_name>
+    /usr/bin/python /usr/bin/nova-manage network create <project-network> <number-of-networks-in-project> <IPs in project>
+ 
+Here is an example of what this looks like with real data::
+
+    /usr/bin/python /usr/bin/nova-manage user admin dub
+    /usr/bin/python /usr/bin/nova-manage project create dubproject dub
+    /usr/bin/python /usr/bin/nova-manage network create 192.168.0.0/24 1 255
+ 
+(I chose a /24 since that falls inside my /12 range I set in ‘fixed-range’ in nova.conf.  Currently, there can only be one network, and I am using the max IP’s available in a  /24.  You can choose to use any valid amount that you would like.)
+ 
+Note: The nova-manage service assumes that the first IP address is your network (like 192.168.0.0), that the 2nd IP is your gateway (192.168.0.1), and that the broadcast is the very last IP in the range you defined (192.168.0.255). If this is not the case you will need to manually edit the sql db 'networks' table.o.
+ 
+On running this command, entries are made in the 'networks' and 'fixed_ips' table. However, one of the networks listed in the 'networks' table needs to be marked as bridge in order for the code to know that a bridge exists. The Network is marked as bridged automatically based on the type of network manager selected.  This is ONLY necessary if you chose FlatManager as your network type.  More information can be found at the end of this document discussing setting up the bridge device.
+ 
+ 
+Step 5 - Create Nova certifications
+-----------------------------------
+ 
+1.  Generate the certs as a zip file.  These are the certs you will use to launch instances, bundle images, and all the other assorted api functions. 
+
+::
+
+    mkdir –p /root/creds
+    /usr/bin/python /usr/bin/nova-manage project zipfile $NOVA_PROJECT $NOVA_PROJECT_USER /root/creds/novacreds.zip
+ 
+2.  Unzip them in your home directory, and add them to your environment. 
+
+::
+
+    unzip /root/creds/novacreds.zip -d /root/creds/ 
+    cat /root/creds/novarc >> ~/.bashrc
+    source ~/.bashrc
+
+Step 6 - Restart all relevant services
+--------------------------------------
+
+Restart all six services in total, just to cover the entire spectrum::
+ 
+    libvirtd restart; service nova-network restart; service nova-compute restart; service nova-api restart; service nova-objectstore restart; service nova-scheduler restart
+
+Step 7 - Closing steps, and cleaning up
+---------------------------------------
+
+One of the most commonly missed configuration areas is not allowing the proper access to VMs. Use the 'euca-authorize' command to enable access.  Below, you will find the commands to allow 'ping' and 'ssh' to your VMs::
+
+    euca-authorize -P icmp -t -1:-1 default
+    euca-authorize -P tcp -p 22 default
+
+Another common issue is you cannot ping or SSH your instances after issusing the 'euca-authorize' commands.  Something to look at is the amount of 'dnsmasq' processes that are running.  If you have a running instance, check to see that TWO 'dnsmasq' processes are running.  If not, perform the following::
+
+    killall dnsmasq
+    service nova-network restart
+
+Step 8 – Testing the installation
+---------------------------------
+
+You can then use `euca2ools` to test some items::
+
+    euca-describe-images
+    euca-describe-instances
+ 
+If you have issues with the API key, you may need to re-source your creds file::
+
+    . /root/creds/novarc
+ 
+If you don’t get any immediate errors, you’re successfully making calls to your cloud!
+
+Step 9 - Spinning up a VM for testing 
+-------------------------------------
+
+(This excerpt is from Thierry Carrez's blog, with reference to http://wiki.openstack.org/GettingImages.) 
+
+The image that you will use here will be a ttylinux image, so this is a limited function server. You will be able to ping and SSH to this instance, but it is in no way a full production VM.  
+
+Download the image, and publish to your bucket:
+
+::
+
+    image="ttylinux-uec-amd64-12.1_2.6.35-22_1.tar.gz"
+    wget http://smoser.brickies.net/ubuntu/ttylinux-uec/$image
+    uec-publish-tarball $image mybucket
+
+This will output three references, an "emi", an "eri" and an "eki."  (Image, ramdisk, and kernel)  The emi is the one we use to launch instances, so take note of this.
+
+Create a keypair to SSH to the server:
+
+::
+
+    euca-add-keypair mykey > mykey.priv
+
+    chmod 0600 mykey.priv
+
+Boot your instance:
+
+::
+
+    euca-run-instances $emi -k mykey -t m1.tiny 
+
+($emi is replaced with the output from the previous command)
+
+Checking status, and confirming communication:
+
+Once you have booted the instance, you can check the status the the `euca-describe-instances` command.  Here you can view the instance ID, IP, and current status of the VM.  
+
+::
+
+    euca-describe-instances
+
+Once in a "running" state, you can use your SSH key connect:
+
+::
+
+    ssh -i mykey.priv root@$ipaddress
+
+When you are ready to terminate the instance, you may do so with the `euca-terminate-instances` command:
+
+::
+
+    euca-terminate-instances $instance-id
+
+You can determine the instance-id with `euca-describe-instances`, and the format is "i-" with a series of letter and numbers following:  e.g. i-a4g9d.
+
+For more information in creating you own custom (production ready) instance images, please visit http://wiki.openstack.org/GettingImages for more information!
+
+Enjoy your new private cloud, and play responsibly!
+
 
=== modified file 'doc/source/adminguide/network.flat.rst'
--- doc/source/adminguide/network.flat.rst	2010-11-12 17:02:20 +0000
+++ doc/source/adminguide/network.flat.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
 
=== modified file 'doc/source/adminguide/network.vlan.rst'
--- doc/source/adminguide/network.vlan.rst	2010-11-22 22:43:17 +0000
+++ doc/source/adminguide/network.vlan.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
@@ -91,11 +91,10 @@
 Compute nodes have iptables/ebtables entries created per project and
 instance to protect against IP/MAC address spoofing and ARP poisoning.
 
-The network assignment to a project, and IP address assignment to a VM instance, are triggered when a user starts to run a VM instance. When running a VM instance, a user needs to specify a project for the instances, and the security groups (described in Security Groups) when the instance wants to join. If this is the first instance to be created for the project, then Nova (the cloud controller) needs to find a network controller to be the network host for the project; it then sets up a private network by finding an unused VLAN id, an unused subnet, and then the controller assigns them to the project, it also assigns a name to the project's Linux bridge, and allocating a private IP within the project's subnet for the new instance.
+The network assignment to a project, and IP address assignment to a VM instance, are triggered when a user starts to run a VM instance. When running a VM instance, a user needs to specify a project for the instances, and the security groups (described in Security Groups) when the instance wants to join. If this is the first instance to be created for the project, then Nova (the cloud controller) needs to find a network controller to be the network host for the project; it then sets up a private network by finding an unused VLAN id, an unused subnet, and then the controller assigns them to the project, it also assigns a name to the project's Linux bridge (br100 stored in the Nova database), and allocating a private IP within the project's subnet for the new instance.
 
 If the instance the user wants to start is not the project's first, a subnet and a VLAN must have already been assigned to the project; therefore the system needs only to find an available IP address within the subnet and assign it to the new starting instance. If there is no private IP available within the subnet, an exception will be raised to the cloud controller, and the VM creation cannot proceed.
 
-.. todo:: insert the name of the Linux bridge, is it always named bridge?
 
 External Infrastructure
 -----------------------
 
=== modified file 'doc/source/adminguide/nova.manage.rst'
--- doc/source/adminguide/nova.manage.rst	2010-11-17 22:02:11 +0000
+++ doc/source/adminguide/nova.manage.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
 
=== modified file 'doc/source/cloud101.rst'
--- doc/source/cloud101.rst	2010-12-07 22:48:42 +0000
+++ doc/source/cloud101.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
@@ -54,7 +54,7 @@
 The US-based National Institute of Standards and Technology offers definitions for cloud computing
 and the service models that are emerging. 
 
-These definitions are summarized from http://csrc.nist.gov/groups/SNS/cloud-computing/.
+These definitions are summarized from the `U.S. National Institute of Standards and Technology (NIST) cloud computing research group <http://csrc.nist.gov/groups/SNS/cloud-computing/>`_.
 
 SaaS - Software as a Service
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -74,7 +74,6 @@
 Provides infrastructure such as computer instances, network connections, and storage so that people 
 can run any software or operating system.
 
-
 Types of Cloud Deployments
 --------------------------
 
@@ -87,4 +86,5 @@
 Work in the Clouds
 ------------------
 
-.. todo:: What people have done/sample projects
+What have people done with cloud computing? Cloud computing can help with large-scale computing needs or can lead consolidation efforts by virtualizing servers to make more use of existing hardware (and possibly release old hardware from service.) People also use cloud computing for collaboration because of the high availability through networked computers. Productivity suites for word processing, number crunching, and email communications, and more are also available through cloud computing. Cloud computing also avails additional storage to the cloud user, avoiding the need for additional hard drives on your desktop and enabling access to large data storage capacity online in the cloud.
+
 
=== modified file 'doc/source/community.rst'
--- doc/source/community.rst	2010-12-30 17:10:31 +0000
+++ doc/source/community.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/addmethod.openstackapi.rst'
--- doc/source/devref/addmethod.openstackapi.rst	2010-12-30 19:23:52 +0000
+++ doc/source/devref/addmethod.openstackapi.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 OpenStack LLC 
+      Copyright 2010-2011 OpenStack LLC 
       All Rights Reserved.
 
       Licensed under the Apache License, Version 2.0 (the "License"); you may
 
=== modified file 'doc/source/devref/api.rst'
--- doc/source/devref/api.rst	2010-11-09 04:38:21 +0000
+++ doc/source/devref/api.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/architecture.rst'
--- doc/source/devref/architecture.rst	2010-11-04 23:00:46 +0000
+++ doc/source/devref/architecture.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/auth.rst'
--- doc/source/devref/auth.rst	2010-11-09 04:38:21 +0000
+++ doc/source/devref/auth.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/cloudpipe.rst'
--- doc/source/devref/cloudpipe.rst	2010-11-22 23:03:54 +0000
+++ doc/source/devref/cloudpipe.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/compute.rst'
--- doc/source/devref/compute.rst	2010-11-09 04:38:21 +0000
+++ doc/source/devref/compute.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/database.rst'
--- doc/source/devref/database.rst	2010-11-09 04:38:21 +0000
+++ doc/source/devref/database.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
@@ -60,4 +60,4 @@
 -----
 
 Tests are lacking for the db api layer and for the sqlalchemy driver.
-Failures in the drivers would be dectected in other test cases, though.
+Failures in the drivers would be detected in other test cases, though.
 
=== modified file 'doc/source/devref/development.environment.rst'
--- doc/source/devref/development.environment.rst	2010-12-30 17:25:14 +0000
+++ doc/source/devref/development.environment.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/fakes.rst'
--- doc/source/devref/fakes.rst	2010-11-09 04:38:21 +0000
+++ doc/source/devref/fakes.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/glance.rst'
--- doc/source/devref/glance.rst	2010-11-09 04:38:21 +0000
+++ doc/source/devref/glance.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/index.rst'
--- doc/source/devref/index.rst	2010-11-23 18:49:28 +0000
+++ doc/source/devref/index.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/network.rst'
--- doc/source/devref/network.rst	2010-11-09 04:38:21 +0000
+++ doc/source/devref/network.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/nova.rst'
--- doc/source/devref/nova.rst	2010-11-09 04:38:21 +0000
+++ doc/source/devref/nova.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/objectstore.rst'
--- doc/source/devref/objectstore.rst	2010-11-09 04:38:21 +0000
+++ doc/source/devref/objectstore.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/rabbit.rst'
--- doc/source/devref/rabbit.rst	2010-12-30 19:23:52 +0000
+++ doc/source/devref/rabbit.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,6 @@
 ..
       Copyright (c) 2010 Citrix Systems, Inc.
+      All Rights Reserved.
       
       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
@@ -29,7 +30,7 @@
 
 ..
 
-Nova implements RPC (both request+response, and one-way, respectively nicknamed 'rpc.call' and 'rpc.cast') over AMQP by providing an adapter class which take cares of marshalling and unmarshalling of messages into function calls. Each Nova service (for example Compute, Volume, etc.) create two queues at the initialization time, one which accepts messages with routing keys 'NODE-TYPE.NODE-ID' (for example compute.hostname) and another, which accepts messages with routing keys as generic 'NODE-TYPE' (for example compute). The former is used specifically when Nova-API needs to redirect commands to a specific node like 'euca-terminate instance'. In this case, only the  compute node whose host's hypervisor is running the virtual machine can kill the instance. The API acts as a consumer when RPC calls are request/response, otherwise is acts as publisher only. 
+Nova implements RPC (both request+response, and one-way, respectively nicknamed 'rpc.call' and 'rpc.cast') over AMQP by providing an adapter class which take cares of marshaling and unmarshaling of messages into function calls. Each Nova service (for example Compute, Volume, etc.) create two queues at the initialization time, one which accepts messages with routing keys 'NODE-TYPE.NODE-ID' (for example compute.hostname) and another, which accepts messages with routing keys as generic 'NODE-TYPE' (for example compute). The former is used specifically when Nova-API needs to redirect commands to a specific node like 'euca-terminate instance'. In this case, only the  compute node whose host's hypervisor is running the virtual machine can kill the instance. The API acts as a consumer when RPC calls are request/response, otherwise is acts as publisher only. 
 
 Nova RPC Mappings
 -----------------
@@ -39,7 +40,7 @@
 Figure 2 shows the following internal elements:
 
     * Topic Publisher: a Topic Publisher comes to life when an rpc.call or an rpc.cast operation is executed; this object is instantiated and used to push a message to the queuing system. Every publisher connects always to the same topic-based exchange; its life-cycle is limited to the message delivery.
-    * Direct Consumer: a Direct Consumer comes to life if (an only if) a rpc.call operation is executed; this object is instantiated and used to receive a response message from the queuing system; Every consumer connects to a unique direct-based exchange via a unique exclusive queue; its life-cycle is limited to the message delivery; the exchange and queue identifiers are determined by a UUID generator, and are marshalled in the message sent by the Topic Publisher (only rpc.call operations).
+    * Direct Consumer: a Direct Consumer comes to life if (an only if) a rpc.call operation is executed; this object is instantiated and used to receive a response message from the queuing system; Every consumer connects to a unique direct-based exchange via a unique exclusive queue; its life-cycle is limited to the message delivery; the exchange and queue identifiers are determined by a UUID generator, and are marshaled in the message sent by the Topic Publisher (only rpc.call operations).
     * Topic Consumer: a Topic Consumer comes to life as soon as a Worker is instantiated and exists throughout its life-cycle; this object is used to receive messages from the queue and it invokes the appropriate action as defined by the Worker role. A Topic Consumer connects to the same topic-based exchange either via a shared queue or via a unique exclusive queue. Every Worker has two topic consumers, one that is addressed only during rpc.cast operations (and it connects to a shared queue whose exchange key is 'topic') and the other that is addressed only during rpc.call operations (and it connects to a unique queue whose exchange key is 'topic.host').
     * Direct Publisher: a Direct Publisher comes to life only during rpc.call operations and it is instantiated to return the message required by the request/response operation. The object connects to a direct-based exchange whose identity is dictated by the incoming message.
     * Topic Exchange: The Exchange is a routing table that exists in the context of a virtual host (the multi-tenancy mechanism provided by RabbitMQ); its type (such as topic vs. direct) determines the routing policy; a RabbitMQ node will have only one topic-based exchange for every topic in Nova.
 
=== modified file 'doc/source/devref/scheduler.rst'
--- doc/source/devref/scheduler.rst	2010-11-09 04:38:21 +0000
+++ doc/source/devref/scheduler.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/services.rst'
--- doc/source/devref/services.rst	2010-11-07 19:58:02 +0000
+++ doc/source/devref/services.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
 
=== modified file 'doc/source/devref/volume.rst'
--- doc/source/devref/volume.rst	2010-11-09 04:38:21 +0000
+++ doc/source/devref/volume.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/index.rst'
--- doc/source/index.rst	2010-12-10 22:03:30 +0000
+++ doc/source/index.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/livecd.rst'
--- doc/source/livecd.rst	2010-12-07 22:48:42 +0000
+++ doc/source/livecd.rst	2011-01-11 22:27:12 +0000
@@ -1,3 +1,20 @@
+..
+      Copyright 2010-2011 OpenStack LLC
+
+      All Rights Reserved.
+
+      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.
+      
 Installing the Live CD
 ======================
 
 
=== modified file 'doc/source/nova.concepts.rst'
--- doc/source/nova.concepts.rst	2010-12-30 19:23:52 +0000
+++ doc/source/nova.concepts.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration.
       All Rights Reserved.
 
@@ -105,7 +105,7 @@
 
 For example: A user can access api commands allowed to the netadmin role (like allocate_address) only if he has the user-specific netadmin role AND the project-specific netadmin role.
 
-More information about RBAC can be found in the :ref:`auth`.
+More information about RBAC can be found in :ref:`auth`.
 
 Concept: API
 ------------
@@ -159,12 +159,10 @@
 
 See :doc:`nova.manage` in the Administration Guide for more details.
 
-
 Concept: Flags
 --------------
 
-Nova uses python-gflags for a distributed command line system, and the flags can either be set when running a command at the command line or within flag files. When you install Nova packages, each Nova service gets its own flag file. For example, nova-network.conf is used for configuring the nova-network service, and so forth. 
-
+Nova uses python-gflags for a distributed command line system, and the flags can either be set when running a command at the command line or within a flag file. When you install Nova packages for the Austin release, each nova service gets its own flag file. For example, nova-network.conf is used for configuring the nova-network service, and so forth. In releases beyond Austin which was released in October 2010, all flags are set in nova.conf.  
 
 Concept: Plugins
 ----------------
 
=== modified file 'doc/source/object.model.rst'
--- doc/source/object.model.rst	2010-11-09 18:11:36 +0000
+++ doc/source/object.model.rst	2011-01-11 22:27:12 +0000
@@ -1,3 +1,20 @@
+..
+      Copyright 2010-2011 OpenStack LLC
+
+      All Rights Reserved.
+
+      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.
+
 Object Model
 ============
 
@@ -25,29 +42,38 @@
 Users
 -----
 
+Each Nova User is authorized based on their access key and secret key, assigned per-user. Read more at :doc:`/adminguide/managing.users`.
+
 Projects
 --------
 
+For Nova, access to images is based on the project. Read more at :doc:`/adminguide/managing.projects`.
 
 Images
 ------
 
+Images are binary files that run the operating system. Read more at :doc:`/adminguide/managing.images`.
 
 Instances
 ---------
 
+Instances are running virtual servers. Read more at :doc:`/adminguide/managing.instances`.
 
 Volumes
 -------
 
+.. todo::  Write doc about volumes
 
 Security Groups
 ---------------
 
+In Nova, a security group is a named collection of network access rules, like firewall policies. Read more at `Security Groups <http://nova.openstack.org/nova.concepts.html#concept-security-groups>`_.
 
 VLANs
 -----
 
+VLAN is the default network mode for Nova. Read more at :doc:`/adminguide/network.vlan`.
 
 IP Addresses
 ------------
+Nova enables floating IP management.
 \ No newline at end of file
 
=== modified file 'doc/source/quickstart.rst'
--- doc/source/quickstart.rst	2010-12-30 19:23:52 +0000
+++ doc/source/quickstart.rst	2011-01-11 22:27:12 +0000
@@ -1,5 +1,5 @@
 ..
-      Copyright 2010 United States Government as represented by the
+      Copyright 2010-2011 United States Government as represented by the
       Administrator of the National Aeronautics and Space Administration. 
       All Rights Reserved.
 
 
=== modified file 'doc/source/service.architecture.rst'
--- doc/source/service.architecture.rst	2010-11-12 19:42:07 +0000
+++ doc/source/service.architecture.rst	2011-01-11 22:27:12 +0000
@@ -1,3 +1,20 @@
+..
+      Copyright 2010-2011 OpenStack LLC
+
+      All Rights Reserved.
+
+      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.
+
 Service Architecture
 ====================