Merge lp:~annegentle/openstackbook/pomupdates into lp:openstackbook

[Anne Gentle]

Minor updates for tool chain needs and automation:
- Updated pom file to the latest doc tool snapshot, removing epub output goal for now.
- Validated all XML files.

[Kiran Murari (kiranm)]

review: Approve

Unmerged revisions

21. By Anne Gentle on 2012-05-09

Updates to pom and validation on all files; build test

20. By Anne Gentle on 2012-05-09

Updates to pom and validation on all files to test build

19. By Kiran Murari on 2012-05-08

Committing diagram changes for essex

18. By Kiran Murari on 2012-05-08

Commiting essex changes

17. By Kiran Murari on 2012-04-24

Changed version information

16. By Kiran Murari on 2012-02-02

Modified description on scheduler functionality

15. By Kiran Murari on 2011-11-30

Merge Lorin's glance changes

14. By Kiran Murari on 2011-11-30

Merge Annes's epub changes, fix typos

13. By Kiran Murari on 2011-11-11

Changed build date

12. By Kiran Murari on 2011-11-09

Minor edits to Introduction chapter

=== modified file 'Commands.xml'
--- Commands.xml	2011-10-19 14:27:25 +0000
+++ Commands.xml	2012-05-09 21:52:21 +0000
@@ -1,265 +1,143 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter xmlns:db="http://docbook.org/ns/docbook" xmlns="http://docbook.org/ns/docbook" xml:id="OpenStack_Commands-d1e2584" version="5.0" xml:base="Commands.xml">
 <title>OpenStack Commands</title>
-<section xml:id="Nova_Manage_Commands-d1e2589">
-<title>Nova Manage Commands</title>
-<para>OpenStack provides commands for administrative tasks such as user/role management,  network management etc. In all the examples we will use username as "novadmin" and project name as "proj". All the nova-manage commands will need to be run as "root". Either run them as root or run them under sudo.</para>
-<section xml:id="User_Role_Management-d1e2597">
-<title>User/Role Management</title>
-<para>Add a new user</para>
-<programlisting>
-nova-manage user create --name=novaadmin
-</programlisting>
-<para>Add a user along with access and secret keys.</para>
-<programlisting>
-nova-manage user create --name=novaadmin --access=myaccess --secret=mysecret
-</programlisting>
-<para>Add a user with admin privileges</para>
-<programlisting>
-nova-manage user admin --name=novaadmin --access=myaccess --secret=mysecret
-</programlisting>
-
-<para>List existing users</para>
-<programlisting>
-nova-manage user list
-</programlisting>
-
-<para>Delete an existing user</para>
-<programlisting>
-nova-manage user delete --name=novaadmin
-</programlisting>
-
-<para>Associate a user to a specific existing project</para>
-<programlisting>
-nova-manage project add --project=proj --user=novaadmin
-</programlisting>
-
-<para>Remove a  user from a specific existing project.</para>
-<programlisting>
-nova-manage project remove --project=proj --user=novaadmin
-</programlisting>
-
-<para>View access key and secret keys of particular user.</para>
-<programlisting>
-nova-manage user exports --name=novaadmin
-</programlisting>
-
-<para>Adding a user sitewide role.</para>
-<programlisting>
-nova-manage role add --user=novaadmin --role=netadmin
-</programlisting>
-
-<para>Remove a sitewide role from a particular user</para>
-<programlisting>
-nova-manage role remove --user=novaadmin --role=netadmin
-</programlisting>
-<para>Adding a user project specific role.</para>
-<programlisting>
-nova-manage role add --user=novaadmin --role=netadmin --project=proj
-</programlisting>
-
-<para>Remove a project specific role from a particular user</para>
-<programlisting>
-nova-manage role remove --user=novaadmin --role=netadmin --project=proj
-</programlisting>
-
-<para>With the command below, you can change any or all of access key, secret key and admin role flag for a particular user.</para>
-<programlisting>
-Syntax:
-nova-manage user modify   username new_access_key new_secret_key admin_flag &lt;admin flag - T or F&gt;
-
-nova-manage user modify --name=novaadmin  --access=mygreatnewaccesskey "" ""
-
-nova-manage user modify --name=novaadmin "" --secret=mygreatsecretkey "" ""
-
-nova-manage user modify --name=novaadmin "" ""  --is_admin=T
-</programlisting>
-
-<para>Check if a particular user has a specific role or not. The role can be either local or global. The output of the command will be True or False</para>
-<programlisting>
-nova-manage role has --user=novaadmin --role=cloudadmin
-True
-
-nova-manage role has --role=novaadmin --role=netadmin --project=proj
-False
-</programlisting>
-</section>
-
-<section xml:id="Project_Management-d1e2672">
-<title>Project Management</title>
-
-<para>The following commands help you create and manage projects.  "nova-manage account" command is an alias to "nova-manage project" and you can use them interchangeably.</para>
-
-<para>Create a project. It requires you to mention name of the project admin as well. css1 is the name of the project and user5 is the name of the project admin here.</para>
-<programlisting>nova-manage project create --project=css1 --user=user5 --desc="My new project"</programlisting>
-
-<para>List the registered projects.</para>
-<programlisting>
-nova-manage project list
-</programlisting>
-
-<para>Download the credentials and associated file for a specific project. Please refer to the chapter on "Installation &amp; Configuration" for more details.</para>
-<programlisting>
-nova-manage project zipfile --project=csscorp --user=user5 --file=/home/user5/mysec.zip
-</programlisting>
-
-<para>Delete an existing project.</para>
-<programlisting>
-nova-manage project delete --project=css1
-</programlisting>
-
-<para>Check the project wise resource allocation. The output will look like this:</para>
-<programlisting>
-nova-manage project quota --project=css1
-	metadata_items: 128
-	gigabytes: 1000
-	floating_ips: 10
-	instances: 10
-	volumes: 10
-	cores: 20
-</programlisting>
-</section>
-
-<section xml:id="Database_Management-d1e2713"><title>Database Management</title>
-
-<para>Nova stores the data related to the projects, users, resources etc. in a database, by default in a MySQL database.</para>
-
-<para>Print the current database version.</para>
-<programlisting>
-nova-manage db version
-</programlisting>
-
-<para>Sync the DB schema to be in sync with the current configuration.</para>
-<programlisting>
-nova-manage db sync
-</programlisting>
-</section>
-
-<section xml:id="Instance_Type_Management-d1e2734"><title>Instance Type Management</title>
-<para>Nova has the concept of instance types. Each instance type is defined with certain amount of RAM and certain size of the hard disk. When an instance is launched with a particular instance type, Nova resizes the disk image to suit the instance type and allocates the RAM as defined for the instance type chosen. Nova calls instance types as 'flavors' and lets you add to the list of flavors. By default Nova has 5 types - m1.tiny, m1.small, m1.medium, m1.large and m1.xlarge.</para>
-
-<para>List the current instance types</para>
-<programlisting>
-nova-manage flavor list
-	m1.medium: Memory: 4096MB, VCPUS: 2, Storage: 40GB, FlavorID: 3, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
-	m1.large: Memory: 8192MB, VCPUS: 4, Storage: 80GB, FlavorID: 4, Swap: 0GB,
-RXTX Quota: 0GB, RXTX Cap: 0MB
-	m1.tiny: Memory: 512MB, VCPUS: 1, Storage: 0GB, FlavorID: 1, Swap: 0GB,
-RXTX Quota: 0GB, RXTX Cap: 0MB
-	m1.xlarge: Memory: 16384MB, VCPUS: 8, Storage: 160GB, FlavorID: 5, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
-	m1.small: Memory: 2048MB, VCPUS: 1, Storage: 20GB, FlavorID: 2, Swap: 0GB,
-RXTX Quota: 0GB, RXTX Cap: 0MB
-</programlisting>
-
-<para>Define a new instance type</para>
-<programlisting>
-nova-manage flavor create --name=m1.miniscule --memory=128 --cpu=1 --local_gb=20 --flavor=6 --swap=0 --rxtx_quota=0 --rxtx_cap=0
-</programlisting>
-
-<para>Remove an existing instance type.</para>
-<programlisting>
-nova-manage flavor delete --name=m1.miniscule
-m1.miniscule deleted
-</programlisting>
-</section>
-
-<section xml:id="Service_Management-d1e2761"><title>Service Management</title>
-
-<para>Check state of available services.</para>
-<programlisting>
-nova-manage service list
-	server1 nova-scheduler enabled  :- ) 2011-04-06 17:01:21
-	server1 nova-network enabled  :- ) 2011-04-06 17:01:30
-	server1  nova-compute enabled  :- ) 2011-04-06 17:01:22
-	server2 nova-compute enabled  :- ) 2011-04-06 17:01:28
-</programlisting>
-
-<para>Disable a running service</para>
-<programlisting>
-nova-manage service disable &lt;hostname&gt; &lt;service&gt;
-nova-manage service disable --host=server2 --service=nova-compute
-
-nova-manage service list
-	server1 nova-network enabled  :- ) 2011-04-06 17:05:11
-	server1 nova-compute enabled  :- ) 2011-04-06 17:05:13
-	server1 nova-scheduler enabled :- ) 2011-04-06 17:05:17
-	server2 nova-compute disabled  :- ) 2011-04-06 17:05:19
-</programlisting>
-
-<para>Re-enable a service that is currently disabled</para>
-<programlisting>
-Syntax: nova-manage service enable &lt;hostname&gt; &lt;service&gt;
-nova-manage service enable --host=server2 --service=nova-compute
-
-nova-manage service list
-	server1 nova-scheduler enabled  :- ) 2011-04-06 17:08:23
-	server1 nova-network enabled  :- ) 2011-04-06 17:08:22
-	server1 nova-compute enabled  :- ) 2011-04-06 17:08:23
-	server2 nova-compute enabled  :- ) 2011-04-06 17:08:19
-</programlisting>
-
-<para>Get Information about resource utilization of the OpenStack components</para>
-<programlisting>
-Syntax: nova-manage service describe_resource &lt;hostname&gt;
-
-nova-manage service describe_resource --host=server1
-HOST		PROJECT		cpu	mem(mb)		disk(gb)
-server1(total)  		2	3961		224
-server1(used)			1	654		30
-server1		proj		2	1024		0
-</programlisting>
-</section>
-
-<section xml:id="Euca2ools_Commands-d1e2791"><title>Euca2ools Commands</title>
-
-<para>euca2ools provide a set of commands to communicate with the cloud. All these commands require you to authenticate and this is done by sourcing novarc file as detailed in the chapter on "Installation &amp; Configuration"</para>
-
-<para>Most of the euca2ools command line utilities work with OpenStack, just as they work with EC2 of AWS. There may be some differences due to some of the functionality that is yet to be implemented in OpenStack. Help is available for each of these commands  with the switch --help.</para>
-
-<itemizedlist>
-	  <listitem><para>euca-add-group</para></listitem>
-	  <listitem><para>euca-delete-bundle</para></listitem>
-  	  <listitem><para>euca-describe-instances</para></listitem>
-	  <listitem><para>euca-register</para></listitem>
-	  <listitem><para>euca-add-keypair</para></listitem>
-	  <listitem><para>euca-delete-group</para></listitem>
-	  <listitem><para>euca-describe-keypairs</para></listitem>
-	  <listitem><para>euca-release-address</para></listitem>
-	  <listitem><para>euca-allocate-address</para></listitem>
-	  <listitem><para>euca-delete-keypair</para></listitem>
-	  <listitem><para>euca-describe-regions</para></listitem>
-	  <listitem><para>euca-reset-image-attribute</para></listitem>
-	  <listitem><para>euca-associate-address</para></listitem>
-	  <listitem><para>euca-delete-snapshot</para></listitem>
-	  <listitem><para>euca-describe-snapshots</para></listitem>
-	  <listitem><para>euca-revoke</para></listitem>
-	  <listitem><para>euca-attach-volume</para></listitem>
-	  <listitem><para>euca-delete-volume</para></listitem>
-	  <listitem><para>euca-describe-volumes</para></listitem>
-	  <listitem><para>euca-run-instances</para></listitem>
-	  <listitem><para>euca-authorize</para></listitem>
-	  <listitem><para>euca-deregister</para></listitem>
-	  <listitem><para>euca-detach-volume</para></listitem>
-	  <listitem><para>euca-terminate-instances</para></listitem>
-	  <listitem><para>euca-bundle-image</para></listitem>
-	  <listitem><para>euca-describe-addresses</para></listitem>
-	  <listitem><para>euca-disassociate-address</para></listitem>
-	  <listitem><para>euca-unbundle</para></listitem>
-	  <listitem><para>euca-bundle-vol</para></listitem>
-	  <listitem><para>euca-describe-availabity-zones</para></listitem>
-	  <listitem><para>euca-download-bundle</para></listitem>
-	  <listitem><para>euca-upload-bundle</para></listitem>
-	  <listitem><para>euca-confirm-product-instance</para></listitem>
-	  <listitem><para>euca-describe-groups</para></listitem>
-	  <listitem><para>euca-get-console-output</para></listitem>
-	  <listitem><para>euca-version</para></listitem>
-	  <listitem><para>euca-create-snapshot</para></listitem>
-	  <listitem><para>euca-describe-image-attribute</para></listitem>
-	  <listitem><para>euca-modify-image-attribute</para></listitem>
-	  <listitem><para>euca-create-volume</para></listitem>
-	  <listitem><para>euca-describe-images</para></listitem>
-	  <listitem><para>euca-reboot-instances</para></listitem>
-</itemizedlist>
-</section>
-</section>
+
+<section xml:id="Nova_Commands-d1e2589">
+<title>Nova Commands</title>
+<para>nova is the command line interface for OpenStack Compute API.</para>
+<programlisting>
+Usage: nova command [options] [args]
+
+Commands:
+    help                   Display help about this program or one of its subcommands.
+    actions                Retrieve server actions.
+    backup-schedule        Show or edit the backup schedule for a server.
+    backup-schedule-delete Delete the backup schedule for a server.
+    boot                   Boot a new server.
+    delete                 Immediately shut down and delete a server.
+    diagnostics            Retrieve server diagnostics.
+    flavor-list            Print a list of available 'flavors' (sizes of servers).
+    image-create           Create a new image by taking a snapshot of a running server.
+    image-delete           Delete an image.
+    image-list             Print a list of available images to boot from.
+    ip-share               Share an IP address from the given IP group onto a server.
+    ip-unshare             Stop sharing an given address with a server.
+    ipgroup-create         Create a new IP group.
+    ipgroup-delete         Delete an IP group.
+    ipgroup-list           Show IP groups.
+    ipgroup-show           Show details about a particular IP group.
+    list                   List active servers.
+    pause                  Pause a server.
+    reboot                 Reboot a server.
+    rebuild                Shutdown, re-image, and re-boot a server.
+    rename                 Rename a server.
+    rescue                 Rescue a server.
+    resize                 Resize a server.
+    resize-confirm         Confirm a previous resize.
+    resize-revert          Revert a previous resize (and return to the previous VM).
+    resume                 Resume a server.
+    root-password          Change the root password for a server.
+    show                   Show details about the given server.
+    suspend                Suspend a server.
+    unpause                Unpause a server.
+    unrescue               Unrescue a server.
+    zone                   Show or edit a child zone.
+    zone-add               Add a new child zone.
+    zone-delete            Delete a zone.
+    zone-info              Get this zones name and capabilities.
+    zone-list              List the children of a zone.
+</programlisting>
+</section>
+
+<section xml:id="Glance_Commands-d1e2672">
+<title>Glance Commands</title>
+<para>Glance is the command line interface for the OpenStack Imaging service.</para>
+<programlisting>
+Usage: glance command [options] [args]
+
+Commands:
+    help command    Output help for one of the commands below
+    add             Adds a new image to Glance
+    update          Updates an image's metadata in Glance
+    delete          Deletes an image from Glance
+    index           Return brief information about images in Glance
+    details         Return detailed information about images in
+                    Glance
+    show            Show detailed information about an image in
+                    Glance
+    clear           Removes all images and metadata from Glance
+
+Member Commands:
+    image-members    List members an image is shared with
+    member-images    List images shared with a member
+    member-add       Grants a member access to an image
+    member-delete    Revokes a member's access to an image
+    members-replace  Replaces all membership for an image
+</programlisting>
+</section>
+
+<section xml:id="Swift_Commands-d1e2713">
+<title>Swift Commands</title>
+<para>Swift is the command line interface for OpenStack Object Store service.</para>
+<programlisting>
+Usage: swift command [options] [args]
+
+Commands:
+    stat     Displays information for the account, container, or object depending
+             on the args given (if any).
+    list     Lists the containers for the account or the objects for a container.
+    upload   Uploads to the given container the files and directories specified by
+             the remaining args.
+    post     Updates meta information for the account, container, or object 
+             depending on the args given.
+    download Downloads everything in the account (with --all), or everything in
+             a container, or a list of objects depending on the args given.
+    delete   Deletes everything in the account (with --all), or everything in
+             a container, or a list of objects depending on the args given.
+</programlisting>
+</section>
+
+<section xml:id="Keystone_Commands-d1e2734">
+<title>Keystone Commands</title>
+<para>Keystone is the command line interface to the OpenStack Identity service.</para>
+<programlisting>
+Usage: keystone command [options] [args]
+
+Commands:
+    catalog                 List service catalog, possibly filtered by service.
+    ec2-credentials-create  Create EC2-compatibile credentials for user per tenant
+    ec2-credentials-delete  Delete EC2-compatibile credentials
+    ec2-credentials-get     Display EC2-compatibile credentials
+    ec2-credentials-list    List EC2-compatibile credentials for a user
+    endpoint-create         Create a new endpoint associated with a service
+    endpoint-delete         Delete a service endpoint
+    endpoint-get            Find endpoint filtered by a specific attribute or service type
+    endpoint-list           List configured service endpoints
+    role-create             Create new role
+    role-delete             Delete role
+    role-get                Display role details
+    role-list               List all roles, or only those granted to a user.
+    service-create          Add service to Service Catalog
+    service-delete          Delete service from Service Catalog
+    service-get             Display service from Service Catalog
+    service-list            List all services in Service Catalog
+    tenant-create           Create new tenant
+    tenant-delete           Delete tenant
+    tenant-get              Display tenant details
+    tenant-list             List all tenants
+    tenant-update           Update tenant name, description, enabled status
+    token-get               Display the current user token
+    user-create             Create new user
+    user-delete             Delete user
+    user-get                Display user details.
+    user-list               List users
+    user-password-update    Update user password
+    user-role-add           Add role to user
+    user-role-remove        Remove role from user
+    user-update             Update user's name, email, and enabled status
+    discover                Discover Keystone servers and show authentication protocols and
+    help                    Display help about this program or one of its subcommands.
+</programlisting>
+</section>
+
 </chapter>
\ No newline at end of file

=== added file 'Dashboard.xml'
--- Dashboard.xml	1970-01-01 00:00:00 +0000
+++ Dashboard.xml	2012-05-09 21:52:21 +0000
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?><chapter xmlns:db="http://docbook.org/ns/docbook" xmlns="http://docbook.org/ns/docbook" xml:id="Storage_Management-d1e1995" version="5.0" xml:base="Dashboard.xml">
+<title>OpenStack Dashboard (Horizon)</title>
+<para>Using the OpenStack Dashboard, one can manage various OpenStack services. It may be used to manage instances and images, create keypairs, attach volumes to instances, manipulate Swift containers etc. The OpenStack Dashboard is accessible via http://&lt;ip_address&gt;</para>
+
+<section xml:id="Login-d1e5000">
+<title>Login</title>
+<para>Login to the dashboard with username "admin" and password "admin".</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/login.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/login.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+</section>
+
+<section xml:id="User_Overview-d1e5002">
+<title>User Overview</title>
+<para>After logging, depending on the access privileges, the user is allowed access to specific projects. The below is an overview page for a project belonging to the 'admin' user. One can view and download some basic usage metric reports here.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/overview.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/overview.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+<section xml:id="Instances-d1e5003">
+<title>Instances</title>
+<para>The page lists currently running instances belonging to the user 'admin'. From this page, one can terminate, pause, reboot any running instances, connect to vnc console of the instance etc.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/instances.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/instances.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Services-d1e5004">
+<title>Services</title>
+<para>The list of services defiend can be viewed on this page.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/services.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/services.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Flavors-d1e5005">
+<title>Flavors</title>
+<para>This page lists the currently available flavors that can be used to launch an instance. One can also create custom flavors on this page.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/flavors.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/flavors.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Images-d1e5006">
+<title>Images</title>
+<para>This page lists the available images for the 'admin' user. One can also delete any images, if they are not required.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/images.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/images.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Projects-d1e5007">
+<title>Projects</title>
+<para>This page lists the available projects (tenants) that have been created. One can also create new projects, assign users to the projects etc.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/projects.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/projects.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Users-d1e5008">
+<title>Users</title>
+<para>This page lists the users that have been created. One can also create new users, disable/delete existing users.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/users.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/users.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Quotas-d1e5008">
+<title>Users</title>
+<para>This page lists the quota of resources allocated to  a user; number of CPUs, amount of RAM, diskspace, max. number of instances that can be raised etc.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/quotas.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/quotas.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+</section>
+</section>
+
+<section xml:id="Project_Overview-d1e5009">
+<title>Project Overview</title>
+<para>This page shows an overview of the project 'admin'. One can view and download some basic usage metric reports here.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/overview2.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/overview2.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+<section xml:id="Instances_Volumes-d1e5009">
+<title>Instances &amp; Volumes</title>
+<para>This page lists all the instances belonging to various users of the project, instance properties etc. It also list all the volumes that have been created and their status; whether available or attached to any running instances. One can also create new volumes and attach them to the instances on this page.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/instances_volumes.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/instances_volumes.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Instances_VNC-d1e5016">
+<title>Instances - VNC Console</title>
+<para>For a running instance, one can connect to the instance console via VNC.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/vnc1.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/vnc1.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/vnc2.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/vnc2.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Images_Snapshots-d1e5009">
+<title>Images &amp; Snapshots</title>
+<para>This page lists the custom images that have been uploaded. One can edit the image properties, delete and launch new instances of the images. This page also lists the snapshots taken from instances and volumes.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/images_snapshots.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/images_snapshots.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Access_Security-d1e5010">
+<title>Access &amp; Security</title>
+<para>On this page, one can allocate and release floating ip addresses, associate and dissociate them to instances. New security groups can be created and one can modify the rules belonging to each security group.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/access_security.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/access_security.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/edit_security_securitygp.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/edit_security_securitygp.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/create_keypair.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/create_keypair.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+</section>
+</section>
+<section xml:id="Containers_Objects-d1e5011">
+<title>Containers &amp; Objects</title>
+<para>On this page, one can create/delete containers, lists objects, upload/download objects and delete objects.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/containers.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/containers.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+            <imagedata fileref="images/dashboard/objects.png"
+				format="PNG" scale="50"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/dashboard/objects.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+</section>
+</chapter>

=== modified file 'Image.xml'
--- Image.xml	2011-10-19 14:27:25 +0000
+++ Image.xml	2012-05-09 21:52:21 +0000
@@ -1,55 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?><chapter xmlns:db="http://docbook.org/ns/docbook" xmlns="http://docbook.org/ns/docbook" xml:id="Image_Management-d1e1252" version="5.0" xml:base="Image.xml">
-   <title>Image Management</title>
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter xmlns:db="http://docbook.org/ns/docbook" 
+    xmlns="http://docbook.org/ns/docbook" 
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xmlns:xlink="http://www.w3.org/1999/xlink" 
+    xml:id="Image_Management-d1e1252" version="5.0" 
+    xml:base="Image.xml">
+<title>Image Management</title>
 <section xml:id="Introduction-d1e1257">
 <title>Introduction</title>
-<para> There are several pre-built images for OpenStack available from  various sources. You can download such images and use them to get familiar with OpenStack. You can refer to http://docs.openstack.org/cactus/openstack-compute/admin/content/starting-images.html for details on using such images.</para>
-<para>For any production deployment,  you may like to have the ability to bundle custom images, with a custom set of applications or configuration. This chapter will guide you through the process of creating Linux images of Debian and RedHat based distributions from scratch. We have also covered an approach to bundling Windows images.
-   </para>
-   <para>There are some minor differences in the way you would bundle a Linux image, based on the distribution. Ubuntu makes it very easy by providing cloud-init package, which can be used to take care of the instance configuration at the time of launch. cloud-init handles importing ssh keys for password-less login, setting host name etc. The instance acquires the instance specific configuration from Nova-compute by connecting to a meta data interface running on 169.254.169.254.</para>
-   <para>While creating the image of a distro that does not have cloud-init or an equivalent package, you may need to take care of importing the keys etc. by running a set of commands at boot time from rc.local.</para>
-   <para>The process used for Ubuntu and Fedora is largely the same with a few minor differences, which are explained below.</para>
-   <para>In both cases, the documentation below assumes that you have a working KVM installation to use for creating the images. We are using the machine called 'client1' as explained in the chapter on "Installation and Configuration" for this purpose.</para>
-   <para>The approach explained below will give you disk images that represent a disk without any partitions. Nova-compute can resize such disks ( including resizing the file system) based on the instance type chosen at the time of launching the instance. These images cannot have 'bootable' flag and hence it is mandatory to have associated kernel and ramdisk images. These kernel and ramdisk images need to be used by nova-compute at the time of launching the instance.</para>
-   <para>However, we have also added a small section towards the end of the chapter about creating bootable images with multiple partitions that can be used by nova to launch an instance without the need for  kernel and ramdisk images. The caveat is that while nova-compute can re-size such disks at the time of launching the instance, the file system size is not altered and hence, for all practical purposes, such disks are not re-sizable.</para></section>
-<section xml:id="Creating_a_Linux_Image_-_Ubuntu_Fedora-d1e1287">
-<title>Creating a Linux Image - Ubuntu &amp; Fedora</title>
-<para>The first step would be to create a raw image on Client1. This will represent the main HDD of the virtual machine, so make sure to give it as much space as you will need.</para>
-
+<para> There are several pre-built images for OpenStack available from  various sources. You can download such images and use them to get familiar with OpenStack.</para>
+<para>For any production deployment, you may like to have the ability to bundle custom images, with a custom set of applications or configuration. This chapter will guide you through the process of creating Linux images of popular distributions from scratch. We have also covered an approach to bundling Windows images.</para>
+<para>There are some minor differences in the way you would bundle a Linux image, based on the distribution. Ubuntu makes it very easy by providing cloud-init package, which can be used to take care of the instance configuration at the time of launch. cloud-init handles importing ssh keys for password-less login, setting host name etc. The instance acquires the instance specific configuration from Nova-compute by connecting to a meta data interface running on 169.254.169.254.</para>
+<para>While creating the image of a distro that does not have cloud-init or an equivalent package, you may need to take care of importing the keys etc. by running a set of commands at boot time from rc.local.</para>
+<para>The process used for creating the Linux images of different distributions is largely the same with a few minor differences, which is explained below.</para>
+<para>In all the cases, the documentation below assumes that you have a working KVM installation to use for creating the images. We are using the machine called 'client1' as explained in the chapter on "Installation and Configuration" for this purpose.</para>
+<para>The approach explained below will generate disk images that represent a disk without any partitions.</para>
+</section>
+<section xml:id="Creating_a_Linux_Image-d1e1287">
+<title>Creating a Linux Image</title>
+<para>The first step would be to create an image on Client1. This will represent the main HDD of the virtual machine, so make sure to give it as much space as you will need.</para>
 <programlisting> 
-kvm-img create -f raw server.img 5G
+kvm-img create -f qcow2 server.img 5G
 </programlisting>
-
 <section xml:id="OS_Installation-d1e1298">
 <title>OS Installation</title>
-
-<para>Download the iso file of the Linux distribution you want installed in the image. The instructions below are tested on Ubuntu 11.10 Oneiric Ocelot 64-bit server and Fedora 14 64-bit. Most of the instructions refer to Ubuntu. The points of difference between Ubuntu and Fedora are mentioned wherever required.</para>
-<programlisting> 
-wget http://releases.ubuntu.com/oneiric/ubuntu-11.10-server-amd64.iso
- </programlisting>
-
+    <para>Download the iso file of the Linux distribution you want to install in the image. For Ubuntu, you can download the iso from <link xlink:href="http://releases.ubuntu.com">http://releases.ubuntu.com</link> using 'wget' or with the help of a browser</para>
 <para>Boot a KVM instance with the OS installer ISO in the virtual CD-ROM. This will start the installation process. The command below also sets up a VNC display at port 0</para>
 <programlisting> 
-sudo kvm -m 256 -cdrom ubuntu-11.10-server-amd64.iso -drive file=server.img,if=scsi,index=0 -boot d -net nic -net user -nographic  -vnc :0
+sudo kvm -m 256 -cdrom ubuntu-12.04-server-amd64.iso -drive file=server.img,if=virtio,index=0 -boot d -net nic -net user -nographic  -vnc :0
 </programlisting> 
- 
 <para>Connect to the VM through VNC (use display number :0) and finish the installation.</para>
 <para>For Example,  where 10.10.10.4 is the IP address of client1:</para>
-
 <programlisting> 
 vncviewer 10.10.10.4 :0
 </programlisting> 
-<para>During the installation of Ubuntu, create a single ext4 partition mounted on '/'. Do not create a swap partition.</para>
-<para>In the case of Fedora 14, the installation will not progress unless you create a swap partition. Please go ahead and create a swap partition.</para>
+<para>During creation of Linux images , create a single ext4 partition mounted on a swap partition.</para>
 <para>After finishing the installation, relaunch the VM by executing the following command.</para>
-
 <programlisting> 
-sudo kvm -m 256 -drive file=server.img,if=scsi,index=0,boot=on -boot c -net nic -net user -nographic -vnc :0
+sudo kvm -m 256 -drive file=server.img,if=virtio,index=0 -boot c -net nic -net user -nographic -vnc :0
 </programlisting>    
-  
-
 <para>At this point, you can add all the packages you want to have installed, update the installation, add users and make any configuration changes you want in your image.</para> 
-<para>At the minimum, for Ubuntu you may run the following commands</para>
 
+<section xml:id="Ubuntu-d1e1386">
+<title>Ubuntu</title>
 <programlisting> 
 sudo apt-get update
 </programlisting> 
@@ -58,8 +51,14 @@
 </programlisting> 
 <programlisting> 
 sudo apt-get install openssh-server cloud-init
-</programlisting>  
-<para>For Fedora run the following commands as root</para>
+</programlisting>
+<para>Remove the network persistence rules from /etc/udev/rules.d as their presence will result in the network interface in the instance coming up as an interface other than eth0.</para>
+<programlisting> 
+sudo rm -rf /etc/udev/rules.d/70-persistent-net.rules
+</programlisting>
+</section>
+<section xml:id="Fedora-d1e1585">
+<title>Fedora</title>
 <programlisting> 
 yum update
 </programlisting> 
@@ -68,105 +67,21 @@
 </programlisting> 
 <programlisting> 
 chkconfig sshd on
-</programlisting> 
-
-<section xml:id="Tweaking_etc_fstab-d1e1463">
-<title>Tweaking /etc/fstab</title>
-<para>You will need to tweak /etc/fstab to make it suitable for a cloud instance. Nova-compute may resize the disk at the time of launching instances based on the instance type chosen. This can make the UUID of the disk invalid. Hence we have to use file system label as the identifier for the partition instead of the UUID. Edit /etc/fstab and change the following line from</para>
-<programlisting> 
-UUID=e7f5af8d-5d96-45cc-a0fc-d0d1bde8f31c   / ext4 errors=remount-ro   0   1
-</programlisting> 
-<para>to</para>
-<programlisting> 
-LABEL=uec-rootfs    /    ext4        defaults    0   0
-</programlisting> 
-</section>
-<para>Also remove the network persistence rules from /etc/udev/rules.d as their presence will result in the network interface in the instance coming up as an interface other than eth0.</para>
-
+</programlisting>
+<para>Edit the file /etc/sysconfig/network-scripts/ifcfg-eth0 to look like this</para>
+<programlisting>
+DEVICE="eth0"
+BOOTPROTO=dhcp
+NM_CONTROLLED="yes"
+ONBOOT="yes"
+</programlisting>
+<para>Remove the network persistence rules from /etc/udev/rules.d as their presence will result in the network interface in the instance coming up as an interface other than eth0.</para>
 <programlisting> 
 sudo rm -rf /etc/udev/rules.d/70-persistent-net.rules
 </programlisting>
-<para>Shutdown the virtual machine and proceed with the next steps.</para>
-</section>
-<section xml:id="Extracting_the_EXT4_partition-d1e1377">
-<title>Extracting the EXT4 partition</title>
-<para>The image that needs to be uploaded to OpenStack needs to be an ext4 filesystem image. Here are the steps to create a ext4 filesystem image from the raw image i.e server.img</para>
-<programlisting> 
-sudo losetup -f  server.img
-</programlisting> 
-<programlisting> 
-sudo losetup -a
-</programlisting>  
-<para>You should see an output like this:</para>
-
-<programlisting> 
-/dev/loop0: [0801]:16908388 ($filepath)
-</programlisting>            
-
-<para>Observe the name of the loop device ( /dev/loop0 in our setup) when $filepath is the path to the mounted .raw file.</para>
-
- <para>Now we need to find out the starting sector of the partition. Run:</para>
-
-<programlisting> 
-sudo fdisk -cul /dev/loop0
-</programlisting> 
-<para>You should see an output like this:</para>
-<programlisting> 
-Disk /dev/loop0: 5368 MB, 5368709120 bytes
-</programlisting> 
-
-<programlisting> 
-149 heads, 8 sectors/track, 8796 cylinders, total 10485760 sectors
-Units = sectors of 1 * 512 = 512 bytes
-Sector size (logical/physical): 512 bytes / 512 bytes
-I/O size (minimum/optimal): 512 bytes / 512 bytes
-Disk identifier: 0x00072bd4
-Device              Boot  Start      End               Blocks        Id     System
-/dev/loop0p1  *       2048     10483711    5240832   83    Linux
-</programlisting>
-
-
-<para>Make a note of the starting sector of the /dev/loop0p1 partition i.e the partition whose ID is 83. This number should be multiplied by 512 to obtain the correct value. In this case: 2048 x 512 = 1048576</para>
-<para>Unmount the loop0 device:</para>
-
-<programlisting> 
-sudo losetup -d /dev/loop0
-</programlisting>
-
-<para>Now mount only the partition(/dev/loop0p1) of server.img which we had previously noted down, by adding the -o parameter with value previously calculated value</para>
-
-<programlisting> 
-sudo losetup -f -o 1048576 server.img
-</programlisting> 
-
-<programlisting> 
-sudo losetup -a
-</programlisting> 
-<para>You'll see a message like this:</para>
-<programlisting> 
-/dev/loop0: [0801]:16908388 ($filepath) offset 1048576
-</programlisting> 
-<para>Make a note of the mount point of our device(/dev/loop0 in our setup) when $filepath is the path to the mounted .raw file.</para>
-
-<para>Copy the entire partition to a new .raw file</para>
-<programlisting> 
-sudo dd if=/dev/loop0 of=serverfinal.img
-</programlisting> 
-
-<para>Now we have our ext4 filesystem image i.e serverfinal.img</para>
-
-<para>Unmount the loop0 device</para>
-
-<programlisting> 
-sudo losetup -d /dev/loop0
-</programlisting> 
-</section>
-<section xml:id="Fetching_Metadata_in_Fedora-d1e1488">
-<title>Fetching Metadata in Fedora</title>
-
+<para>Shutdown the virtual machine.</para>
 <para>Since, Fedora does not ship with cloud-init or an equivalent, you will need to take a few steps to have the instance  fetch the meta data like ssh keys etc.</para>
-   <para>Edit the /etc/rc.local file and add the following lines before the line "touch /var/lock/subsys/local"</para>
-
+<para>Edit the /etc/rc.local file and add the following lines before the line "touch /var/lock/subsys/local"</para>
 <programlisting> 
 depmod -a
 modprobe acpiphp
@@ -180,88 +95,99 @@
 echo "************************"
 </programlisting> 
 </section>
-<para>Unmount the Loop partition</para>
-
-<programlisting> 
-sudo umount /mnt
-</programlisting> 
-<para>Change the filesystem label of serverfinal.img to 'uec-rootfs'</para>
-<programlisting> 
-sudo tune2fs -L uec-rootfs serverfinal.img
-</programlisting> 
-
-<para>Now, we have all the components of the image ready to be uploaded to OpenStack imaging server.</para>
-</section>
-<section xml:id="Uploading_to_OpenStack-d1e1534">
-<title>Uploading to OpenStack</title>
-<para>The last step would be to upload the images to OpenStack Imaging Server glance. The files that need to be uploaded for the above sample setup of Ubuntu are: vmlinuz-2.6.38-7-server, initrd.img-2.6.38-7-server, serverfinal.img</para>
-<para>Run the following command</para>
-
-<programlisting> 
-uec-publish-image amd64 serverfinal.img bucket1
-</programlisting> 
-
-<para>For Fedora, the process will be similar. Make sure that you use the right kernel and initrd files extracted above.</para>
-<para>uec-publish-image, like several other commands from euca2ools, returns the prompt back immediately. However, the upload process takes some time and the images will be usable only after the process is complete. You can keep checking the status using the command 'euca-describe-images' as mentioned below.</para>
-
-<para>You can upload bootable disk images without associating kernel and ramdisk images. When you do not want the flexibility of using the same disk image with different kernel/ramdisk images, you can go for bootable disk images. This greatly simplifies the process of bundling and uploading the images. However, the caveats mentioned in the introduction to this chapter apply. Please note that the instructions below use server.img and you can skip all the cumbersome steps related to extracting the single ext4 partition.</para>
-
-<programlisting> 
-euca-bundle-image -i server.img
-</programlisting> 
-<programlisting> 
-euca-upload-bundle -b mybucket -m /tmp/server.img.manifest.xml
-</programlisting> 
-<programlisting> 
-euca-register mybucket/server.img.manifest.xml
-</programlisting> 
-</section>
-<section xml:id="Image_Listing-d1e1568">
-<title>Image Listing</title>
-
-<para>The status of the images that have been uploaded can be viewed by using euca-describe-images command. The output should like this:</para>
-
-<programlisting> 
-localadmin@client1:~$ euca-describe-images
-</programlisting> 
-<programlisting>
-IMAGE	ami-00000003	mybucket9/Fedora14Nova.img.manifest.xml		available	private		x86_64	machine		instance-store
-</programlisting>
-</section>
+<section xml:id="OpenSUSE-de1590">
+<title>OpenSUSE</title>
+<para>Select ssh server, curl and other packages needed.</para>
+<para>Install ssh server.</para>
+<programlisting>zypper install openssh</programlisting>
+<para>Install curl.</para>
+<programlisting>zypper install curl</programlisting>
+<para>For ssh key injection into the instance use the following steps:</para>
+<para>Create a file /etc/init.d/sshkey and add the following lines</para>
+<programlisting>
+echo >> /root/.ssh/authorized_keys
+curl -m 10 -s http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key | grep 'ssh-rsa' >> /root/.ssh/authorized_keys
+echo "AUTHORIZED_KEYS:"
+echo "************************"
+cat /root/.ssh/authorized_keys
+echo "************************"
+</programlisting>
+<para>Change the permissions for the file.</para>
+<programlisting>chmod 755 /etc/init.d/sshkey</programlisting>
+<para>Configure the service to start automatically while booting.</para>
+<programlisting>chkconfig sshkey on</programlisting>
+<para>Configure the firewall (not iptables) using the following command and allow ssh service</para>
+<programlisting>yast2</programlisting>
+<para>Also remove the network persistence rules from /etc/udev/rules.d as their presence will result in the network interface in the instance coming up as an interface other than eth0.</para>
+<programlisting>rm -rf /etc/udev/rules.d/70-persistent-net.rules</programlisting>
+</section>
+<section xml:id="Debian-de1591">
+<title>Debian</title>
+<para>Select SSH server, Curl and other packages needed.</para>
+<para>Do the necessary changes needed for the image. For key injection add the following lines in the file /etc/rc.local.</para>
+<programlisting>
+echo >> /root/.ssh/authorized_keys
+curl -m 10 -s http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key | grep 'ssh-rsa' >> /root/.ssh/authorized_keys
+echo "AUTHORIZED_KEYS:"
+echo "************************"
+cat /root/.ssh/authorized_keys
+echo "************************"
+</programlisting>
+<para>Also remove the network persistence rules from /etc/udev/rules.d as their presence will result in the network interface in the instance coming up as an interface other than eth0.</para>
+<programlisting>rm -rf /etc/udev/rules.d/70-persistent-net.rules</programlisting>
+</section>
+<section xml:id="CentOS-de1592">
+<title>CentOS 6 and RHEL 6</title>
+<para>Select SSH server, Curl and other packages needed.</para>
+<para>Do the necessary changes needed for the image. For key injection add the following lines in the file /etc/rc.local.</para>
+<programlisting>
+echo >> /root/.ssh/authorized_keys
+curl -m 10 -s http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key | grep 'ssh-rsa' >> /root/.ssh/authorized_keys
+echo "AUTHORIZED_KEYS:"
+echo "************************"
+cat /root/.ssh/authorized_keys
+echo "************************"
+</programlisting>
+<para>Edit the file /etc/sysconfig/network-scripts/ifcfg-eth0 to look like this</para>
+<programlisting>
+DEVICE="eth0"
+BOOTPROTO=dhcp
+NM_CONTROLLED="yes"
+ONBOOT="yes"
+</programlisting>
+<para>Remove the network persistence rules from /etc/udev/rules.d as their presence will result in the network interface in the instance coming up as an interface other than eth0.</para>
+<programlisting>rm -rf /etc/udev/rules.d/70-persistent-net.rules</programlisting>
+</section>
+</section>
+<section xml:id="Uploading_the_Linux_Image-de1593">
+<title>Uploading the Linux image</title>
+<para>Upload the image</para>
+<programlisting>glance add name="&lt;Image name&gt;" is_public=true container_format=ovf disk_format=qcow2 &lt; &lt;filename&gt;.img</programlisting>
+</section>
+</section>
+
 <section xml:id="Creating_a_Windows_Image-d1e1594">
 <title>Creating a Windows Image</title>
-<para>The first step would be to create a raw image on Client1, this will represent the main HDD of the virtual machine, so make sure to give it as much space as you will need.</para>
-
-<programlisting> 
-kvm-img create -f raw windowsserver.img 20G
-</programlisting> 
-
-<para>OpenStack presents the disk using aVIRTIO interface while launching the instance. Hence the OS needs to have drivers for VIRTIO. By default, the Windows Server 2008 ISO does not have the drivers for VIRTIO. Download the virtual floppy drive containing VIRTIO drivers from the following location</para>
-   <para>
-      http://alt.fedoraproject.org/pub/alt/virtio-win/latest/images/bin/
-   </para>
-   <para>and attach it during the installation</para>
-   <para>Start the installation by running</para>
-
-<programlisting> 
-sudo kvm -m 1024 -cdrom win2k8_dvd.iso -drive file=windowsserver.img,if=virtio,boot=on -fda virtio-win-1.1.16.vfd -boot d -nographic -vnc :0
-</programlisting> 
-
-<para>When the installation prompts you to choose a hard disk device you won't see any devices available. Click on "Load drivers" at the bottom left and load the drivers from A:\i386\Win2008</para>
-   <para>After the Installation is over, boot into it once and install any additional applications you need to install and make any configuration changes you need to make. Also ensure that RDP is enabled as that would be the only way you can connect to a running instance of Windows. Windows firewall needs to be configured to allow incoming ICMP and RDP connections.</para>
-   <para>For OpenStack to allow incoming RDP Connections, use euca-authorize command to open up port 3389 as described in the chapter on "Security".</para>
+<para>The first step would be to create an image on Client1, this will represent the main HDD of the virtual machine, so make sure to give it as much space as you will need.</para>
+<programlisting> 
+kvm-img create -f qcow2 windowsserver.img 20G
+</programlisting> 
+<section xml:id="OS_Installation-d1e1596">
+<title>OS Installation</title>
+    <para>OpenStack presents the disk using a virtio interface while launching the instance. Hence the OS needs to have drivers for virtio. By default, the Windows Server 2008 ISO does not have the drivers for virtio. Download the iso image containing virtio drivers from the following location <link xlink:href="http://alt.fedoraproject.org/pub/alt/virtio-win/latest/images/bin">http://alt.fedoraproject.org/pub/alt/virtio-win/latest/images/bin</link> and attach it during the installation</para>
+<para>Start the installation by executing:</para>
+<programlisting>
+sudo kvm -m 1024 -cdrom windows2008.iso -drive file=windowsserver1.img,if=virtio -boot d -drive file=virtio-win-0.1-22.iso,index=3,media=cdrom  -device virtio-net-pci -net nic -net user -nographic -vnc :5
+</programlisting>
+<para>When the installation prompts you to choose a hard disk device you won't see any devices available. Click on "Load drivers" at the bottom left and load the drivers by browsing the secondary CDROM in which the virtio driver disk is loaded</para>
+<para>After the installation is over, boot into it once and install any additional applications you need to install and make any configuration changes you need to make. Also ensure that RDP is enabled as that would be the only way you can connect to a running instance of Windows. Windows firewall needs to be configured to allow incoming ICMP and RDP connections.</para>
+<section xml:id="Uploading_the_Windows_Image-de1599">
+<title>Uploading the Windows image</title>
 <para>Shut-down the VM and upload the image to OpenStack</para>
-
-<programlisting> 
-euca-bundle-image -i windowsserver.img
-</programlisting> 
-
-<programlisting> 
-euca-upload-bundle -b mybucket -m /tmp/windowsserver.img.manifest.xml
-</programlisting> 
-
-<programlisting> 
-euca-register mybucket/windowsserver.img.manifest.xml
+<programlisting> 
+glance add name="windows" is_public=true container_format=ovf disk_format=qcow2 &lt; windowsserver.img
 </programlisting>
 </section>
-</chapter>
\ No newline at end of file
+</section>
+</section>
+</chapter>

=== modified file 'Installation.xml'
--- Installation.xml	2011-10-19 14:27:25 +0000
+++ Installation.xml	2012-05-09 21:52:21 +0000
@@ -2,95 +2,94 @@
  <title>Installation and Configuration</title>
 <section xml:id="Introduction-d1e390">
 <title>Introduction</title>
-<para>The following section describes how to set up a minimal cloud infrastructure based on OpenStack using 3 machines. These machines are referred to in this and subsequent chapters as Server1 and Server2 and Client1. Server1 runs all the components of Nova as well as Glance and Swift. Server2 runs only nova-compute. Since OpenStack components follow a shared-nothing policy, each component or any group of components can be installed on any server.</para>
-<para>Client1 is not a required component. In our sample setup, it is used for bundling images, as a client to the web interface, and to run euca commands to manage the infrastructure. Having this client ensures that you do not need to meddle with the servers for tasks such as bundling. Also, bundling of Desktop Systems including Windows will require a GUI and it is better to have a dedicated machine for this purpose. We would recommend this machine to be VT-Enabled so that KVM can be run which allows for Windows VMs during image creation for bundling.</para>
+<para>The following section describes how to set up a minimal cloud infrastructure based on OpenStack using 3 machines. These machines are referred to in this and subsequent chapters as Server1, Server2 and Client1. Server1 runs all the components of Nova, Glance, Swift, Keystone and Horizon (OpenStack Dashboard). Server2 runs only nova-compute. Since OpenStack components follow a shared-nothing policy, each component or any group of components can be installed on any server.</para>
+<para>Client1 is not a required component. In our sample setup, it is used for bundling images, as a client to the web interface and to run OpenStack commands to manage the infrastructure. Having this client ensures that you do not need to meddle with the servers for tasks such as bundling. Also, bundling of desktop Systems including Windows will require a GUI and it is better to have a dedicated machine for this purpose. We would recommend this machine to be VT-Enabled so that KVM can be run which allows launching of VMs during image creation for bundling.</para>
 <para>
 <mediaobject>
  <imageobject role="fo">
-  <imagedata fileref="images/openstackv5.png"
-   format="PNG" scale="60"/>
+  <imagedata fileref="images/setup.png"
+   format="PNG" scale="15"/>
  </imageobject>
  <imageobject role="html">
-  <imagedata fileref="images/openstackv5html.png"
+  <imagedata fileref="images/setuphtml.png"
    format="PNG" />
  </imageobject>
 </mediaobject>
 </para>
 
 <para>The installation steps use certain specifics such as host names/IP addresses etc. Modify them to suit your environment before using them. The following table summarizes these specifics.</para>
-<table xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:html="http://www.w3.org/1999/xhtml" frame="all">
-<title>Configuration</title>
-<tgroup cols="4">
+<table rules="all">
+<caption>Configuration</caption>
+
 <thead>
-<row>
-<entry/>
-<entry>Server1</entry>
-<entry>Server2</entry>
-<entry>Client1</entry>
-</row>
+<tr>
+<td>Server1</td>
+<td>Server2</td>
+<td>Client1</td>
+</tr>
 </thead>
 <tbody>
-<row>
-<entry>Functionality</entry>
-<entry>All components of OpenStack including nova-compute</entry>
-<entry>nova-compute</entry>
-<entry>Client</entry>
-</row>
-<row>
-<entry>Network Interfaces</entry>
-<entry>eth0 - Public N/W, eth1 - Private N/W</entry>
-<entry>eth0 - Public N/W, eth1 - Private N/W</entry>
-<entry>eth0 - Public N/W</entry>
-</row>
-<row>
-<entry>IP addresses</entry>
-<entry>eth0 - 10.10.10.2, eth1 - 192.168.3.1</entry>
-<entry>eth0 - 10.10.10.3, eth1 - 192.168.3.2</entry>
-<entry>eth0 - 10.10.10.4</entry>
-</row>
-<row>
-<entry>Hostname</entry>
-<entry>server1.example.com</entry>
-<entry>server2.example.com</entry>
-<entry>client.example.com</entry>
-</row>
-<row>
-<entry>DNS servers</entry>
-<entry>10.10.10.3</entry>
-<entry>10.10.10.3</entry>
-<entry>10.10.10.3</entry>
-</row>
-<row>
-<entry>Gateway IP</entry>
-<entry>10.10.10.1</entry>
-<entry>10.10.10.1</entry>
-<entry>10.10.10.1</entry>
-</row>
+<tr>
+<td>Functionality</td>
+<td>All components of OpenStack including nova-compute</td>
+<td>nova-compute</td>
+<td>Client</td>
+</tr>
+<tr>
+<td>Network Interfaces</td>
+<td>eth0 - Public N/W, eth1 - Private N/W</td>
+<td>eth0 - Public N/W, eth1 - Private N/W</td>
+<td>eth0 - Public N/W</td>
+</tr>
+<tr>
+<td>IP addresses</td>
+<td>eth0 - 10.10.10.2, eth1 - 192.168.3.1</td>
+<td>eth0 - 10.10.10.3, eth1 - 192.168.3.2</td>
+<td>eth0 - 10.10.10.4</td>
+</tr>
+<tr>
+<td>Hostname</td>
+<td>server1.example.com</td>
+<td>server2.example.com</td>
+<td>client.example.com</td>
+</tr>
+<tr>
+<td>DNS servers</td>
+<td>10.10.8.3</td>
+<td>10.10.8.3</td>
+<td>10.10.8.3</td>
+</tr>
+<tr>
+<td>Gateway IP</td>
+<td>10.10.10.1</td>
+<td>10.10.10.1</td>
+<td>10.10.10.1</td>
+</tr>
 </tbody>
-</tgroup>
+
 </table>
 </section>
 <section xml:id="Server1-d1e537">
 <title>Server1</title>
- <para>As shown in the figure above, Server1 contains all nova- services including nova-compute, nova-api, nova-volume, nova-network, as well as the Image Service Glance and Swift. It contains two Network Interface Cards (NICs).</para>
+ <para>As shown in the figure above, Server1 contains all nova- services including nova-compute, nova-api, nova-volume, nova-network, Glance, Swift, Keystone and Horizon. It contains two network interface cards (NICs).</para>
 <section xml:id="Base_OS-d1e542">
 <title>Base OS</title>
-<para>Install 64 bit version of Ubuntu server 11.10 keeping the following configurations in mind.</para>
+<para>Install 64 bit version of Ubuntu server 12.04 keeping the following configurations in mind.</para>
 <itemizedlist>
 <listitem><para>Create the first user with the name 'localadmin' .</para></listitem>
 <listitem><para>Installation lets you setup the IP address for the first interface i.e. eth0. Set the IP address details.</para></listitem>
 <listitem><para>During installation select only Openssh-server in the packages menu.</para></listitem>
 </itemizedlist>
-<para>We will also be running nova-volume on this server and it is ideal to have a dedicated partition for the use of nova-volume. So, ensure that you choose manual partitioning scheme while installing Ubuntu Server and create a dedicated partition with adequate amount of space for this purpose. We have referred to this partition in the rest of the chapter as /dev/sda6. You can substitute the correct device name of this dedicated partition based on your local setup while following the instructions. Also ensure that the partition type is set as Linux LVM (8e) using fdisk either during install or immediately after installation is over.</para>
+<para>We will also be running nova-volume on this server and it is ideal to have a dedicated partition for the use of nova-volume. So, ensure that you choose manual partitioning scheme while installing Ubuntu Server and create a dedicated partition with adequate amount of space for this purpose. We have referred to this partition in the rest of the chapter as /dev/sda6. You can substitute the correct device name of this dedicated partition based on your local setup while following the instructions. Also ensure that the partition type is set as Linux LVM (8e) using fdisk either during install or immediately after installation is over. If you also plan to use a dedicated partition as Swift backend, create another partition for this purpose and follow the instructions in "Swift Installation" section below.</para>
 <para>Update the machine using the following commands.</para>
-<programlisting>sudo apt-get update</programlisting>
-<programlisting>sudo apt-get upgrade</programlisting>
+<programlisting>sudo apt-get update
+sudo apt-get upgrade
+</programlisting>
 <para>Install bridge-utils:</para>
-<programlisting>sudo apt-get install -y bridge-utils</programlisting>
-<para>Reboot the server and login as the admin user(localadmin) created during the OS installation.</para>
+<programlisting>sudo apt-get install bridge-utils</programlisting>
 </section>
-<section xml:id="Networking_Configuration-d1e591">
-<title>Networking Configuration</title>
+<section xml:id="Network_Configuration-d1e591">
+<title>Network Configuration</title>
 <para>Edit the /etc/network/interfaces file so as to looks like this:</para>
 <programlisting>
 auto lo
@@ -102,7 +101,7 @@
 		netmask 255.255.255.0
 		broadcast 10.10.10.255
 		gateway 10.10.10.1
-		dns-nameservers 10.10.10.100
+		dns-nameservers 10.10.8.3
 
 auto eth1
 iface eth1 inet static
@@ -116,142 +115,299 @@
 </section>
 <section xml:id="NTP_Server-d1e609">
 <title>NTP Server</title>
-<para>Install NTP package. This server is going to act as an NTP server for the nodes. The time on all components of OpenStack will have to be in sync. We can run NTP server on this and have other components sync to it.</para>
-<programlisting>sudo apt-get install -y ntp</programlisting>
-<para>Open the file /etc/ntp.conf and add the following lines to make sure that the time of the server is in sync with an external server and in case Internet connectivity is down, NTP server uses its own hardware clock as the fallback.</para>
+<para>Install NTP package. This server shall act as the NTP server for the nodes. The time on all components of OpenStack will have to be in sync. We can run NTP server on server1 and have other servers/nodes sync to it.</para>
+<programlisting>sudo apt-get install ntp</programlisting>
+<para>Open the file /etc/ntp.conf and add the following lines to make sure that the time on the server stays in sync with an external server. If the Internet connectivity is down, the NTP server uses its own hardware clock as the fallback.</para>
 <programlisting>
 server ntp.ubuntu.com
 server 127.127.1.0
 fudge 127.127.1.0 stratum 10
 </programlisting>
-<para>Restart NTP service to make the changes effective</para>
-<programlisting>sudo /etc/init.d/ntp restart</programlisting>
+<para>Restart the NTP server</para>
+<programlisting>sudo service ntp restart</programlisting>
+<para>Ensure that, IP addresses of the servers are resolvable by the DNS. If not, include the hostnames in /etc/hosts file.</para>
 </section>
 
 <section xml:id="Database_Server-d1e657"><title>Databases</title>
 <para>You can use MySQL, PostgreSQL or SQLite for Nova and Glance. Depending upon your choice of database, you will need to install the necessary packages and configure the database server.</para>
 <section xml:id="MySQL-d1e856">
 <title>MySQL</title>
-<para>Install mysql-server package</para>
-<programlisting>sudo apt-get install -y mysql-server
+<para>Install mysql-server and python-mysqldb package</para>
+<programlisting>sudo apt-get install mysql-server python-mysqldb
 </programlisting>
-<para>Create the root password for mysql. The password here is "mygreatsecret"</para> 
-<para>Change the bind address from 127.0.0.1 to 0.0.0.0 in /etc/mysql/my.cnf and it will look like this:</para>
+<para>Create the root password for mysql. The password used in this guide is "mygreatsecret"</para> 
+<para>Change the bind address from 127.0.0.1 to 0.0.0.0 in /etc/mysql/my.cnf. It should be identical to this:</para>
 <programlisting>bind-address = 0.0.0.0
 </programlisting>
 <para>Restart MySQL server to ensure that it starts listening on all interfaces.</para>
 <programlisting>sudo restart mysql
 </programlisting>
 </section>
-<section xml:id="PostgreSQL-dle678">
-<title>PostgreSQL</title>
-<para>Install PostgreSQL and the python driver for PostgreSQL</para>
-<programlisting>sudo apt-get install -y postgresql python-psycopg2</programlisting>
-<para>Setup PostgreSQL to listen on all interfaces by editing /etc/postgresql/9.1/main/postgresql.conf and uncommenting and modifying the relevant line. Look for the right file if you have a different version of PostgreSQL</para>
-<programlisting>listen_addresses = '*'</programlisting>
-<para>Restart PostgreSQL server to ensure that it starts listening on all interfaces.</para>
-<programlisting>sudo /etc/init.d/postgresql restart</programlisting>
-</section>
-<section xml:id="SQLite-dle899">
-<title>SQLite</title>
-<para>Install SQLite</para>
-<programlisting>sudo apt-get install -y sqlite</programlisting>
-</section> 
-</section>
-
-<section xml:id="Glance-d1e634">
-<title>Glance</title>
-<para>Nova can use Glance service to manage Operating System images that it needs for bringing up instances. Glance can use several types of storage backends such as filestore, s3 etc.</para>
-<programlisting>sudo apt-get install -y glance
-</programlisting>
-<para>The default config file at /etc/glance/glance.conf is good to use for a simple file store as the storage backend. Glance can be configured to use other storage backends such as Swift.</para>
-<para>Glance uses sqlite as the default database backend. While sqlite offers a quick and easy way to get started, for production use, you may consider a database such as MySQL or PostgreSQL.</para>
-<para>Glance has two components - glance-api and glance-registry. These can be controlled using the concerned upstart jobs.</para>
-<section xml:id="Glancedb-d1a734">
-<title>Database Configuration</title>
-<para>Glance uses SQLite by default. MySQL and PostgreSQL can also be configured to work with Glance.</para>
-<section xml:id="GlanceMS-d2s21">
-<title>MySQL</title>
-<para>Create a database named glance</para>
+<section xml:id="Creating_Databases-d1e921">
+<title>Creating Databases</title>
+<para>Create MySQL databases to be used with nova, glance and keystone.</para>
+<para>Create a database named nova.</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE DATABASE nova;'</programlisting>
+<para>Create a user named novadbadmin.</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE USER novadbadmin;'</programlisting>
+<para>Grant all privileges for novadbadmin on the database "nova".</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e "GRANT ALL PRIVILEGES ON nova.* TO 'novadbadmin'@'%';"</programlisting>
+<para>Create a password for the user "novadbadmin".</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e "SET PASSWORD FOR 'novadbadmin'@'%' = PASSWORD('novasecret');"</programlisting>
+<para>Create a database named glance.</para>
 <programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE DATABASE glance;'</programlisting>
-<para>Create a user named glancedbadmin</para>
+<para>Create a user named glancedbadmin.</para>
 <programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE USER glancedbadmin;'</programlisting>
-<para>Grant all privileges for glancedbadmin on the Database "glance".</para>
-<programlisting>sudo mysql -uroot -pmygreatsecret -e "GRANT ALL PRIVILEGES ON glance.* TO 'glancedbadmin'@'%' ;"</programlisting>
-<para>Create a password for the user "glanceadmin"</para>
+<para>Grant all privileges for glancedbadmin on the database "glance".</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e "GRANT ALL PRIVILEGES ON glance.* TO 'glancedbadmin'@'%';"</programlisting>
+<para>Create a password for the user "glancedbadmin".</para>
 <programlisting>sudo mysql -uroot -pmygreatsecret -e "SET PASSWORD FOR 'glancedbadmin'@'%' = PASSWORD('glancesecret');"</programlisting>
-<para>Edit the file /etc/glance/glance-registry.conf and edit the line which contains the option "sql_connection =" to this:</para>
+<para>Create a database named keystone.</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE DATABASE keystone;'</programlisting>
+<para>Create a user named keystonedbadmin.</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE USER keystonedbadmin;'</programlisting>
+<para>Grant all privileges for keystonedbadmin on the database "keystone".</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e "GRANT ALL PRIVILEGES ON keystone.* TO 'keystonedbadmin'@'%';"</programlisting>
+<para>Create a password for the user "keystonedbadmin".</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e "SET PASSWORD FOR 'keystonedbadmin'@'%' = PASSWORD('keystonesecret');"</programlisting>
+</section>
+</section>
+
+<section xml:id="Keystone-d1e456">
+<title>Keystone</title>
+<para>Keystone is the identity service used by OpenStack. Install Keystone using the following command.</para>
+<programlisting>sudo apt-get install keystone python-keystone python-keystoneclient
+</programlisting>
+<para>Open /etc/keystone/keystone.conf and change the line</para>
+<programlisting>admin_token = ADMIN</programlisting>
+<para>so that it looks like the following:</para>
+<programlisting>admin_token = admin</programlisting>
+<para>(We have used 'admin' as the token in this book.)</para>
+<para>Since MySQL database is used to store keystone configuration, replace the following line in /etc/keystone/keystone.conf </para>
+<programlisting>connection = sqlite:////var/lib/keystone/keystone.db</programlisting>
+<para>with</para>
+<programlisting>connection = mysql://keystonedbadmin:keystonesecret@10.10.10.2/keystone</programlisting>
+<para>Restart Keystone:</para>
+<programlisting>sudo service keystone restart</programlisting>
+<para>Run the following command to synchronise the database:</para>
+<programlisting>sudo keystone-manage db_sync</programlisting>
+<para>Export environment variables which are required while working with OpenStack.</para>
+<programlisting>
+export SERVICE_ENDPOINT="http://localhost:35357/v2.0"
+export SERVICE_TOKEN=admin
+</programlisting>
+<para>You can also add these variables to ~/.bashrc, so that you need not have to export them everytime.</para>
+<section xml:id="Creating_Keystone_Tenants-d1e458">
+<title>Creating Tenants</title>
+<para>Create the tenants by executing the following commands. In this case, we are creating two tenants - admin and service.</para> 
+<programlisting>
+keystone tenant-create --name admin
+keystone tenant-create --name service
+</programlisting>
+</section>
+<section xml:id="Creating_Keystone_Users-d1e459">
+<title>Creating Users</title>
+<para>Create the users by executing the following commands. In this case, we are creating four users - admin, nova, glance and swift</para>
+<programlisting>
+keystone user-create --name admin --pass admin --email [e-mail] 
+keystone user-create --name nova --pass nova   --email [e-mail]
+keystone user-create --name glance --pass glance   --email [e-mail]
+keystone user-create --name swift --pass swift   --email [e-mail]
+</programlisting>
+</section>
+<section xml:id="Creating_Keystone_Roles-d1e460">
+<title>Creating Roles</title>
+<para>Create the roles by executing the following commands. In this case, we are creating two roles - admin and Member.</para>
+<programlisting>
+keystone role-create --name admin
+keystone role-create --name Member
+</programlisting>
+</section>
+<section xml:id="Listing_Tenants_Users_Roles-d1e462">
+<title>Listing Tenants, Users and Roles</title>
+<para>The tenants, users and roles that have been created above can be listed by following commands:</para>
+<para>List Tenants:</para>
+<programlisting>
+keystone tenant-list
++----------------------------------+--------------------+---------+
+|                id                |        name        | enabled |
++----------------------------------+--------------------+---------+
+| 7f95ae9617cd496888bc412efdceabfd | admin              | True    |
+| c7970080576646c6959ee35970cf3199 | service            | True    |
++----------------------------------+--------------------+---------+
+</programlisting>
+<para>List Users:</para>
+<programlisting>
+keystone user-list
++----------------------------------+---------+-------------------+--------+
+|                id                | enabled |       email       |  name  |
++----------------------------------+---------+-------------------+--------+
+| 1b986cca67e242f38cd6aa4bdec587ca | True    | [e-mail]  | swift  |
+| 518b51ea133c4facadae42c328d6b77b | True    | [e-mail] | glance |
+| b3de3aeec2544f0f90b9cbfe8b8b7acd | True    | [e-mail]  | admin  |
+| ce8cd56ca8824f5d845ba6ed015e9494 | True    | [e-mail]   | nova   |
++----------------------------------+---------+-------------------+--------+
+</programlisting>
+<para>List Roles:</para>
+<programlisting>
+keystone role-list
++----------------------------------+----------------------+
+|                id                |         name         |
++----------------------------------+----------------------+
+| 2bbe305ad531434991d4281aaaebb700 | admin                |
+| d983800dd6d54ee3a1b1eb9f2ae3291f | Member               |
++----------------------------------+----------------------+
+</programlisting>
+<para>Please note that the values of the 'id' column, would be required later when we associate a role to a user in a particular tenant.</para>
+</section>
+<section xml:id="Adding_Roles_to_Users-d1e465">
+<title>Adding Roles to Users in Tenants</title>
+<para>Now we add roles to the users that have been created. A role to a specific user in a specific tenant can be assigned with the following command:</para>
+<programlisting>keystone user-role-add --user $USER_ID --role $ROLE_ID --tenant_id $TENANT_ID
+</programlisting>
+<para>The required 'id' can be obtained from the commands - keystone user-list, keystone tenant-list, keystone role-list.</para>
+<para>To add a role of 'admin' to the user 'admin' of the tenant 'admin'.</para>
+<programlisting>
+keystone user-role-add --user b3de3aeec2544f0f90b9cbfe8b8b7acd --role 2bbe305ad531434991d4281aaaebb700 --tenant_id 7f95ae9617cd496888bc412efdceabfd
+</programlisting>
+<para>The following commands will add a role of 'admin' to the users 'nova', 'glance' and 'swift' of the tenant 'service'.</para>
+<programlisting>
+keystone user-role-add --user ce8cd56ca8824f5d845ba6ed015e9494 --role 2bbe305ad531434991d4281aaaebb700 --tenant_id c7970080576646c6959ee35970cf3199
+keystone user-role-add --user 518b51ea133c4facadae42c328d6b77b --role 2bbe305ad531434991d4281aaaebb700 --tenant_id c7970080576646c6959ee35970cf3199
+keystone user-role-add --user 1b986cca67e242f38cd6aa4bdec587ca --role 2bbe305ad531434991d4281aaaebb700 --tenant_id c7970080576646c6959ee35970cf3199
+</programlisting>
+<para>The 'Member' role is used by Horizon and Swift. So add the 'Member' role accordingly.</para>
+<programlisting>
+keystone user-role-add --user b3de3aeec2544f0f90b9cbfe8b8b7acd --role d983800dd6d54ee3a1b1eb9f2ae3291f --tenant_id 7f95ae9617cd496888bc412efdceabfd
+</programlisting>
+<para>Replace the id appropriately as listed by keystone user-list, keystone role-list, keystone tenant-list.</para>
+</section>
+<section xml:id="Creating_Services-d1e467">
+<title>Creating Services</title>
+<para>Now we need to create the required services which the users can authenticate with. nova-compute, nova-volume, glance, swift, keystone and ec2 are some of the services that we create.</para>
+<programlisting>keystone service-create --name service_name --type service_type --description 'Description of the service'</programlisting>
+<programlisting>
+keystone service-create --name nova --type compute --description 'OpenStack Compute Service'
+keystone service-create --name volume --type volume --description 'OpenStack Volume Service'
+keystone service-create --name glance --type image --description 'OpenStack Image Service'
+keystone service-create --name swift --type object-store --description 'OpenStack Storage Service'
+keystone service-create --name keystone --type identity --description 'OpenStack Identity Service'
+keystone service-create --name ec2 --type ec2 --description 'EC2 Service'
+</programlisting>
+<para>Each of the services that have been created above will be identified with a unique id which can be obtained from the following command:</para>
+<programlisting>
+keystone service-list
++----------------------------------+----------+--------------+----------------------------+
+|                id                |   name   |     type     |        description         |
++----------------------------------+----------+--------------+----------------------------+
+| 1e93ee6c70f8468c88a5cb1b106753f3 | nova     | compute      | OpenStack Compute Service  |
+| 28fd92ffe3824004996a3e04e059d875 | ec2      | ec2          | EC2 Service                |
+| 7d4ec192dfa1456996f0f4c47415c7a7 | keystone | identity     | OpenStack Identity Service |
+| 96f35e1112b143e59d5cd5d0e6a8b22d | swift    | object-store | OpenStack Storage Service  |
+| f38f4564ff7b4e43a52b2f5c1b75e5fa | volume   | volume       | OpenStack Volume Service   |
+| fbafab6edcab467bb734380ce6be3561 | glance   | image        | OpenStack Image Service    |
++----------------------------------+----------+--------------+----------------------------+
+</programlisting>
+<para>The 'id' will be used in defining the endpoint for that service.</para>
+</section>
+<section xml:id="Creating_Endpoints-d1e469">
+<title>Creating Endpoints</title>
+<para>Create endpoints for each of the services that have been created above.</para>
+<programlisting>
+keystone endpoint-create --region region_name --service_id service_id --publicurl public_url --adminurl admin_url  --internalurl internal_url
+</programlisting>
+<para>For creating an endpoint for nova-compute, execute the following command:</para>
+<programlisting>
+keystone endpoint-create --region myregion --service_id 1e93ee6c70f8468c88a5cb1b106753f3 --publicurl 'http://10.10.10.2:8774/v2/$(tenant_id)s' --adminurl 'http://10.10.10.2:8774/v2/$(tenant_id)s' --internalurl 'http://10.10.10.2:8774/v2/$(tenant_id)s'
+</programlisting>
+<para>For creating an endpoint for nova-volume, execute the following command:</para>
+<programlisting>
+keystone endpoint-create --region myregion --service_id f38f4564ff7b4e43a52b2f5c1b75e5fa --publicurl 'http://10.10.10.2:8776/v1/$(tenant_id)s' --adminurl 'http://10.10.10.2:8776/v1/$(tenant_id)s' --internalurl 'http://10.10.10.2:8776/v1/$(tenant_id)s'
+</programlisting>
+<para>For creating an endpoint for glance, execute the following command:</para>
+<programlisting>
+keystone endpoint-create --region myregion --service_id fbafab6edcab467bb734380ce6be3561 --publicurl 'http://10.10.10.2:9292/v1' --adminurl 'http://10.10.10.2:9292/v1' --internalurl 'http://10.10.10.2:9292/v1'
+</programlisting>
+<para>For creating an endpoint for swift, execute the following command:</para>
+<programlisting>
+keystone endpoint-create --region myregion --service_id 96f35e1112b143e59d5cd5d0e6a8b22d --publicurl 'http://10.10.10.2:8080/v1/AUTH_$(tenant_id)s' --adminurl 'http://10.10.10.2:8080/v1' --internalurl 'http://10.10.10.2:8080/v1/AUTH_$(tenant_id)s'
+</programlisting>
+<para>For creating an endpoint for keystone, execute the following command:</para>
+<programlisting>
+keystone endpoint-create --region myregion --service_id 7d4ec192dfa1456996f0f4c47415c7a7 --publicurl http://10.10.10.2:5000/v2.0 --adminurl http://10.10.10.2:35357/v2.0 --internalurl http://10.10.10.2:5000/v2.0
+</programlisting>
+<para>For creating an endpoint for ec2, execute the following command:</para>
+<programlisting>
+keystone endpoint-create --region myregion --service_id 28fd92ffe3824004996a3e04e059d875 --publicurl http://10.10.10.2:8773/services/Cloud --adminurl http://10.10.10.2:8773/services/Admin --internalurl http://10.10.10.2:8773/services/Cloud
+</programlisting>
+</section>
+</section>
+
+<section xml:id="Glance-d1a732">
+<title>Glance</title>    
+<para>Install glance using the following command:</para>
+<programlisting>
+sudo apt-get install glance glance-api glance-client glance-common glance-registry python-glance
+</programlisting>
+<section xml:id="Glance_Config-d1a734">
+<title>Glance Configuration</title>
+<para>Glance uses SQLite by default. MySQL and PostgreSQL can also be configured to work with Glance.</para>
+<para>Open /etc/glance/glance-api-paste.ini and at the end of the file, edit the following lines:</para>
+<programlisting>
+admin_tenant_name = %SERVICE_TENANT_NAME%
+admin_user = %SERVICE_USER%
+admin_password = %SERVICE_PASSWORD%
+</programlisting>
+<para>These values have to be modified as per the configurations made earlier. The admin_tenant_name will be 'service', admin_user will be 'glance' and admin_password is 'glance'.</para>
+<para>After editing, the lines should be as follows:</para>
+<programlisting>
+admin_tenant_name = service
+admin_user = glance
+admin_password = glance
+</programlisting>
+<para>Now open /etc/glance/glance-registry-paste.ini and make similar changes at the end of the file.</para>
+<para>Open the file /etc/glance/glance-registry.conf and edit the line which contains the option "sql_connection =" to this:</para>
 <programlisting>sql_connection = mysql://glancedbadmin:glancesecret@10.10.10.2/glance</programlisting>
-<para>Restart glance-registry after making changes to /etc/glance/glance-registry.conf</para>
-<programlisting>sudo restart glance-registry</programlisting>
-</section>
-<section xml:id="GlancePS-d1f234">
-<title>PostgreSQL</title>
-<para>Create a user called 'glancedbadmin' with password 'glancesecret', create the database 'glance' and give 'glancedbadmin' all privileges on that database.</para>
-<programlisting>
-sudo su - postgres
-psql
-CREATE user glancedbadmin;
-ALTER user glancedbadmin with password 'glancesecret';
-CREATE DATABASE glance;
-GRANT ALL PRIVILEGES ON database glance TO glancedbadmin;
-\q
-exit
-</programlisting>
-<para>Edit the file /etc/glance/glance-registry.conf and edit the line which contains the option "sql_connection =" to this:</para>
-<programlisting>sql_connection = postgresql://glancedbadmin:glancesecret@10.10.10.2/glance</programlisting>
-<para>Restart glance-registry after making changes to /etc/glance/glance-registry.conf</para>
-<programlisting>sudo restart glance-registry</programlisting>
-</section>
-</section>
-</section>
-<section xml:id="Nova-d1e718">
+<para>In order to tell glance to use keystone for authentication, add the following lines at the end of the file.</para>
+<programlisting>
+[paste_deploy]
+flavor = keystone
+</programlisting>
+<para>Open /etc/glance/glance-api.conf and add the following lines at the end of the document.</para>
+<programlisting>
+[paste_deploy]
+flavor = keystone
+</programlisting>
+<para>Create glance schema in the MySQL database.:</para>
+<programlisting>
+sudo glance-manage version_control 0
+sudo glance-manage db_sync
+</programlisting>
+<para>Restart glance-api and glance-registry after making the above changes.</para>
+<programlisting>sudo restart glance-api</programlisting>
+<programlisting>sudo restart glance-registry</programlisting>
+<para>Export the following environment variables.</para>
+<programlisting>
+export SERVICE_TOKEN=admin
+export OS_TENANT_NAME=admin
+export OS_USERNAME=admin
+export OS_PASSWORD=admin
+export OS_AUTH_URL="http://localhost:5000/v2.0/"
+export SERVICE_ENDPOINT=http://localhost:35357/v2.0
+</programlisting>
+<para>Alternatively, you can add these variables to ~/.bashrc.</para>
+<para>To test if glance is setup correectly execute the following command.</para>
+<programlisting>glance index</programlisting>
+<para>The above command will not return any output. The output of the last command executed can be known from its return code - echo $?. If the return code is zero, then glance is setup properly and connects with Keystone.</para>
+<para>With glance configured properly and using keystone as the authentication mechanism, now we can upload images to glance. This has been explained in detail in "Image Management" chapter.</para>
+</section>
+</section>
+
+<section xml:id="Nova-d1a736">
 <title>Nova</title>
-<para>Install the messaging queue server, RabbitMQ and various nova components.</para>
-<programlisting>sudo apt-get install -y rabbitmq-server nova-common nova-doc python-nova nova-api nova-network nova-volume nova-objectstore nova-scheduler nova-compute</programlisting>
-<para>Install euca2ools package for command line tools to interact with nova.</para>
-<programlisting>sudo apt-get install -y euca2ools
-</programlisting>
-<para>Install unzip for extracting archives.</para>
-<programlisting>sudo apt-get install -y unzip
-</programlisting>
-<section  xml:id="NovaDB-d2s241">
-<title>Database Configuration</title>
-<para>Nova can use MySQL or PostgreSQL for storing its data. For non-production use, sqlite is also an option.</para>
-<section xml:id="MySQL_Server-d1e657"><title>MySQL</title>
-<para>Create a database named nova.</para>
-<programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE DATABASE nova;'
-</programlisting>
-<para>Create a user named novadbadmin which has access to nova related databases.</para>
-<programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE USER novadbadmin;'</programlisting>
-<para>Grant all privileges for novadbadmin on the Database "nova".</para>
-<programlisting>sudo mysql -uroot -pmygreatsecret -e "GRANT ALL PRIVILEGES ON nova.* TO 'novadbadmin'@'%' ;"</programlisting>
-<para>Set password for novadbadmin.</para>
-<programlisting>sudo mysql -uroot -pmygreatsecret -e "SET PASSWORD FOR 'novadbadmin'@'%' = PASSWORD('novasecret');"</programlisting>
-</section>
-<section xml:id="PostgreSQL-d2s315">
-<title>PostgreSQL</title>
-<para>Create a user called 'novadbadmin' with password 'novasecret', create the database 'nova' and give 'novadbadmin' all privileges on that database.</para>
-<programlisting>
-sudo su - postgres
-psql
-CREATE user novadbadmin;
-ALTER user novadbadmin with password 'novasecret';
-CREATE DATABASE nova;
-GRANT ALL PRIVILEGES ON database nova TO  novadbadmin;
-\q
-exit
-</programlisting>
-<para>Configure Postgresql to accept connections from users from any machine on 10.10.10.0/24 and 192.168.3.0/24 by adding the following line to /etc/postgresql/9.1/main/pg_hba.conf.</para>
-<programlisting>
-host    all             all             10.10.10.0/24         md5
-host    all             all             192.168.3.0/24          md5
-</programlisting>
-<para>Restart PostgreSQL.</para>
-<programlisting>/etc/init.d/postgresql restart</programlisting>
-</section>
-</section>
-<section xml:id="Nova_conf-d2s367">
+<para>Install nova using the following commands:</para>
+<programlisting>sudo apt-get install nova-api nova-cert nova-compute nova-compute-kvm nova-doc nova-network nova-objectstore nova-scheduler nova-volume rabbitmq-server novnc nova-consoleauth</programlisting>
+<section xml:id="Nova_Conf-d2s738">
 <title>Nova Configuration</title>
 <para>Edit the /etc/nova/nova.conf file to look like this.</para>
 <programlisting>
@@ -259,319 +415,419 @@
 --dhcpbridge=/usr/bin/nova-dhcpbridge
 --logdir=/var/log/nova
 --state_path=/var/lib/nova
---lock_path=/var/lock/nova
---state_path=/var/lib/nova
---verbose
+--lock_path=/run/lock/nova
+--allow_admin_api=true
+--use_deprecated_auth=false
+--auth_strategy=keystone
+--scheduler_driver=nova.scheduler.simple.SimpleScheduler
 --s3_host=10.10.10.2
+--ec2_host=10.10.10.2
 --rabbit_host=10.10.10.2
 --cc_host=10.10.10.2
---ec2_url=http://10.10.10.2:8773/services/Cloud
 --nova_url=http://10.10.10.2:8774/v1.1/
---fixed_range=192.168.0.0/16
---network_size=8
---FAKE_subdomain=ec2
 --routing_source_ip=10.10.10.2
+--glance_api_servers=10.10.10.2:9292
+--image_service=nova.image.glance.GlanceImageService
+--iscsi_ip_prefix=192.168.4
 --sql_connection=mysql://novadbadmin:novasecret@10.10.10.2/nova
---glance_api_servers=192.168.3.2:9292
---image_service=nova.image.glance.GlanceImageService
---iscsi_ip_prefix=192.168.
---vlan_interface=eth1
+--ec2_url=http://10.10.10.2:8773/services/Cloud
+--keystone_ec2_url=http://10.10.10.2:5000/v2.0/ec2tokens
+--api_paste_config=/etc/nova/api-paste.ini
+--libvirt_type=kvm
+--libvirt_use_virtio_for_bridges=true
+--start_guests_on_host_boot=true
+--resume_guests_state_on_host_boot=true
+# vnc specific configuration
+--novnc_enabled=true
+--novncproxy_base_url=http://10.10.10.2:6080/vnc_auto.html
+--vncserver_proxyclient_address=10.10.10.2
+--vncserver_listen=10.10.10.2
+# network specific settings
+--network_manager=nova.network.manager.FlatDHCPManager
 --public_interface=eth0
+--flat_interface=eth1
+--flat_network_bridge=br100
+--fixed_range=192.168.4.1/27
+--floating_range=10.10.10.2/27
+--network_size=32
+--flat_network_dhcp_start=192.168.4.33
+--flat_injected=False
+--force_dhcp_release
+--iscsi_helper=tgtadm
+--connection_type=libvirt
+--root_helper=sudo nova-rootwrap
+--verbose
 </programlisting>
-<para>For configuring with PostgreSQL change the line with --sql_connection to:</para>
-<programlisting>--sql_connection=postgresql://novadbadmin:novasecret@10.10.10.2/nova</programlisting>
-<para>For configuring with SQLite change the line with --sql_connection to:</para>
-<programlisting>--sql_connection=sqlite:////var/lib/nova/nova.sqlite</programlisting>
-<para>Install iscsitarget</para>
-<programlisting>sudo apt-get -y install iscsitarget iscsitarget-dkms</programlisting>
-<para>Enable iscsitarget.</para>
-<programlisting>sudo sed -i 's/false/true/g' /etc/default/iscsitarget</programlisting>
-<para>Restart the iscsitarget service</para>
-<programlisting>sudo service iscsitarget restart</programlisting>
 <para>Create a Physical Volume.</para>
-<programlisting>sudo pvcreate /dev/sda6
+<programlisting>
+sudo pvcreate /dev/sda6
 </programlisting>
 <para>Create a Volume Group named nova-volumes.</para>
-<programlisting>sudo vgcreate nova-volumes /dev/sda6
+<programlisting>
+sudo vgcreate nova-volumes /dev/sda6
 </programlisting>
 <para>Change the ownership of the /etc/nova folder and permissions for /etc/nova/nova.conf:</para>
 <programlisting>
-sudo chown -R root:nova /etc/nova
+sudo chown -R nova:nova /etc/nova
 sudo chmod 644 /etc/nova/nova.conf
 </programlisting>
-<para>Restart all the nova related services.</para>
-<programlisting>sudo restart libvirt-bin; sudo restart nova-network; sudo restart nova-compute; sudo restart nova-api; sudo restart nova-objectstore; sudo restart nova-scheduler; sudo restart nova-volume; sudo restart glance-api; sudo restart glance-registry</programlisting>
-<para>Create nova schema in the MySQL Database.</para>
+<para>Open /etc/nova/api-paste.ini and at the end of the file, edit the following lines:</para>
+<programlisting>
+admin_tenant_name = %SERVICE_TENANT_NAME%
+admin_user = %SERVICE_USER%
+admin_password = %SERVICE_PASSWORD%
+</programlisting>
+<para>These values have to be modified conforming to configurations made earlier. The admin_tenant_name will be 'service', admin_user will be 'nova' and admin_password is 'nova'.</para>
+<para>After editing, the lines should be as follows:</para>
+<programlisting>
+admin_tenant_name = service
+admin_user = nova
+admin_password = nova
+</programlisting>
+<para>Create nova schema in the MySQL database.</para>
 <programlisting>sudo nova-manage db sync</programlisting>
-<para>Provide a range of IPs to be attached to the instances.</para>
-<programlisting>sudo nova-manage network create private 192.168.4.0/24 1 256
-</programlisting>
-<para>Allocate 32 pubic IP addresses for use with the instances starting from 10.10.10.225.</para>
-<programlisting>sudo nova-manage floating create --ip_range=10.10.10.224/27
-</programlisting>
-<para>Create a user with admin rights on nova.</para>
-<programlisting>sudo nova-manage user admin novaadmin
-</programlisting>
-<para>Create a project named proj.</para>
-<programlisting>sudo nova-manage project create proj novaadmin
-</programlisting>
-<para>Restart all the nova related services.</para>
-<programlisting>sudo restart libvirt-bin; sudo restart nova-network; sudo restart nova-compute; sudo restart nova-api; sudo restart nova-objectstore; sudo restart nova-scheduler; sudo restart nova-volume; sudo restart glance-api; sudo restart glance-registry</programlisting>
-<para>Create a directory to download nova credentials and download the zip file.</para>
-<programlisting>mkdir /home/localadmin/creds
-</programlisting>
-<para>Generate and save credentials for accessing/managing the nova cloud.</para>
-<programlisting>sudo nova-manage project zipfile proj novaadmin /home/localadmin/creds/novacreds.zip
-</programlisting>
-<para>Contents of novacreds.zip are required to use euca2ools to manage the cloud infrastructure and you will need to transfer this zip file to any machine from where you want to run the commands from euca2ools. We will be using these credentials from client1 as well.
-</para>
-<para>Navigate in to the folder created and extract the files and change their ownership.</para>
-<programlisting>
-cd /home/localadmin/creds
-unzip novacreds.zip
-sudo chown localadmin:localadmin /home/localadmin/creds/ -R
-</programlisting>
-<para>Here are the files extracted:</para>
-<para>cacert.pem, cert.pem, novarc, pk.pem</para>
-<para>novarc contains several environmental variables including your nova credentials to be set before you can use the commands from euca2ools such euca-describe-images, euca-describe-instances etc. these variables can be set by sourcing novarc file.</para>
-<para>In Diablo, by default novarc file contains EC2_ACCESS_KEY in a format that is not usable by euca-* commands. To fix this:</para>
-<programlisting>sudo nova-manage user exports novaadmin</programlisting>
-<para>The output will be something like:</para>
-<programlisting>
-export EC2_ACCESS_KEY=c043916c-9a0c-4f91-ad6c-4b30908b6c77
-export EC2_SECRET_KEY=d0ac688e-02f3-48f3-b758-96d886461ace
-</programlisting>
-<para>Open the novarc file and replace the line</para>
-<programlisting>export EC2_ACCESS_KEY="novaadmin:proj"</programlisting>
-<para>with</para>
-<programlisting>export EC2_ACCESS_KEY="c043916c-9a0c-4f91-ad6c-4b30908b6c77:proj"</programlisting>
-<programlisting>source /home/localadmin/creds/novarc
-</programlisting>
-<para>Check if the credentials are working and if nova has been setup properly by running:</para>
-<programlisting>euca-describe-availability-zones verbose
-</programlisting>
-<para>If you see something like the following with all components happy, it means that the set up is ready to be used.</para>
-<programlisting>
-AVAILABILITYZONE    nova available
-AVAILABILITYZONE    |- server1
-AVAILABILITYZONE    | |- nova-compute       enabled :-) 2011-09-29 07:26:04
-AVAILABILITYZONE    | |- nova-scheduler     enabled :-) 2011-09-29 07:26:04
-AVAILABILITYZONE    | |- nova-network       enabled :-) 2011-09-29 07:26:07
-AVAILABILITYZONE    | |- nova-volume        enabled :-) 2011-09-29 07:26:06
-</programlisting>
-</section>
-</section>
-<section xml:id="Swift_install">
+<para>Provide a range of IPs to be associated to the instances.</para>
+<programlisting>
+nova-manage network create private --fixed_range_v4=192.168.4.32/27 --num_networks=1 --bridge=br100 --bridge_interface=eth1 --network_size=32 
+</programlisting>
+<para>Export the following environment variables.</para>
+<programlisting>
+export OS_TENANT_NAME=admin
+export OS_USERNAME=admin
+export OS_PASSWORD=admin
+export OS_AUTH_URL="http://localhost:5000/v2.0/"
+</programlisting>
+<para>Restart nova services.</para>
+<programlisting>
+sudo restart libvirt-bin; sudo restart nova-network; sudo restart nova-compute; sudo restart nova-api; sudo restart nova-objectstore; sudo restart nova-scheduler; sudo restart nova-volume; sudo restart nova-consoleauth;
+</programlisting>
+<para>To test if nova is setup correctly run the following command.</para>
+<programlisting>
+sudo nova-manage service list
+Binary           Host              Zone             Status     State Updated_At
+nova-network     server1           nova             enabled    :-)   2012-04-20 08:58:43
+nova-scheduler   server1           nova             enabled    :-)   2012-04-20 08:58:44
+nova-volume      server1           nova             enabled    :-)   2012-04-20 08:58:44
+nova-compute     server1           nova             enabled    :-)   2012-04-20 08:58:45
+nova-cert        server1           nova             enabled    :-)   2012-04-20 08:58:43
+</programlisting>
+<para>If the output is similar to the above with all components happy, your setup is ready to be used.</para>
+</section>
+
+<section xml:id="Openstack_Dashboard-d2s740">
+<title>OpenStack Dashboard</title>
+<para>Install OpenStack Dashboard by executing the following command:</para>
+<programlisting>
+sudo apt-get install openstack-dashboard
+</programlisting>
+<para>Restart apache with the following command:</para>
+<programlisting>service apache2 restart</programlisting>
+<para>Open a browser and enter IP address of the server1. You should see the OpenStack Dashboard login prompt. Login with username 'admin' and password 'admin'. From the dashboard, you can create keypairs, create/edit security groups, raise new instances, attach volumes etc. which are explained in "OpenStack Dashboard" chapter.</para>
+</section>
+
+<section xml:id="Swift-d2s742">
 <title>Swift</title>
-<para>Install Swift via apt-get:</para>
-<programlisting>
-sudo apt-get install swift swift-proxy memcached swift-account swift-container swift-object
-</programlisting>
-<para>Install Swift via apt-get:</para>
-<programlisting>sudo apt-get install xfsprogs curl</programlisting>
-<section xml:id="Swift_configuration">
-<title>Swift Configuration</title>
-<para>There are two methods to configure the storage backend for use by Swift.</para>
-<section xml:id="Physical_device_as_storage">
-<title>Physical Device (Partition) as a storage</title>
-<para>A physical device is partitioned and used as storage. Assuming there is a secondary disk /dev/sdb :</para>
+<section xml:id="Swift_Installation-d2s744">
+<title>Swift Installation</title>
+<para>The primary components are the proxy, account, container and object servers.</para>
+<programlisting>
+sudo apt-get install swift swift-proxy swift-account swift-container swift-object
+</programlisting>
+<para>Other components that might be xfsprogs (for dealing with XFS filesystem), python.pastedeploy (for keystone access), curl (to test swift).</para>
+<programlisting>
+sudo apt-get install xfsprogs curl python-pastedeploy
+</programlisting>
+</section>
+<section xml:id="Swift_Storage_Backends-d2s746">
+<title>Swift Storage Backends</title>
+<para>There are two methods one can try to create/prepare the storage backend. One is to use an existing partition/volume as the storage device. The other is to create a loopback file and use it as the storage device. Use the appropriate method as per your setup.</para>
+<section xml:id="Partition_as_Storage-d2s748">
+<title>Partition as a storage device</title>
+<para>If you had set aside a partition for Swift during the installation of the OS, you can use it directly. If you have an unused/unpartitioned physical partition (e.g. /dev/sdb3), you have to format it to xfs filesystem using parted or fdisk and use it as the backend. You need to specify the mount point in /etc/fstab.</para>
+<programlisting>
+CAUTION: Replace /dev/sdb to your appropriate device. I'm assuming that there is an unused/un-formatted partition section in /dev/sdb
+</programlisting>
 <programlisting>
 sudo fdisk /dev/sdb
-</programlisting>
-<para>Press m for help; n for new partition; p to view the partition table; w to write changes to disk once you are done. You should now have a partiton /dev/sda1.</para>
+
+    Type n for new partition
+    Type e for extended partion
+    Choose appropriate partition number ( or go with the default )
+    Choose first and last sectors to set the hard disk size (or go with defaults)
+    Note that 83 is the partition type number for Linux
+    Type w to write changes to the disk 
+</programlisting>
+<para>This would have created a partition (something like /dev/sdb3) that we can now format to XFS filesystem. Do 'sudo fdisk -l' in the terminal to view and verify the partion table. Find the partition Make sure that the one that you want to use is listed there. This would work only if you have xfsprogs installed.</para>
+<programlisting>
+sudo mkfs.xfs -i size=1024 /dev/sdb3
+sudo tune2fs -l /dev/sdb3 |grep -i inode
+</programlisting>
+<para>Create a directory /mnt/swift_backend that can be used as a mount point to the partion tha we created.</para>
+<programlisting>
+sudo mkdir /mnt/swift_backend
+</programlisting>
+<para>Now edit /etc/fstab and append the following line to mount the partition automatically everytime the system restarts.</para>
+<programlisting>
+/dev/sdb3 /mnt/swift_backend xfs noatime,nodiratime,nobarrier,logbufs=8 0 0
+</programlisting>
 </section>
-<section xml:id="Loopback_device_as_storage">
-<title>Loopback Device (File) as storage</title>
-<para>We create a zero filled file for use as a loopback device for the Swift storage backend. Here we use the disk copy command to create a file named swift-disk and allocate a million 1KiB blocks (976.56 MiB) to it. So we have a loopback disk of approximately 1GiB. We can increase this size by modifying the seek value.</para>
+<section xml:id="Loopback_File_as_Storage-d2s748">
+<title>Loopback File as a storage device</title>
+<para>We create a zero filled file for use as a loopback device for the Swift storage backend. Here we use the disk copy command to create a file named swift-disk and allocate a million 1KiB blocks (976.56 MiB) to it. So we have a loopback disk of approximately 1GiB. We can increase this size by modifying the seek value. The disk is then formated to XFS filesystem. The file command can be used to verify if it worked.</para>
 <programlisting>
 sudo dd if=/dev/zero of=/srv/swift-disk bs=1024 count=0 seek=1000000
-</programlisting>
-</section>
-<para>We now create an xfs filesystem out of the partition or the loopback device we just created. For the loopback file, doing "file swift-disk" will give the details of the device. For the partition details, tune2fs utility can be used with "l" parameter.</para>
-<para>For the physical partition:</para>
-<programlisting>
-sudo mkfs.xfs -i size=1024 /dev/sdb1
-sudo tune2fs -l /dev/sdb1 |grep -i inode
-</programlisting>
-<para> For the loopback file:</para>
-<programlisting>
 sudo mkfs.xfs -i size=1024 /srv/swift-disk
 file /srv/swift-disk
 swift-disk1: SGI XFS filesystem data (blksz 4096, inosz 1024, v2 dirs)
 </programlisting>
-
-<para>The storage device we created has to be mounted automatically everytime the system starts. Lets create an arbitrary mountpoint /mnt/sdb1.
-</para>
-<programlisting>
-sudo mkdir /mnt/sdb1
-</programlisting>
-<para>Edit /etc/fstab and append the following line:</para>
-<para>For the physical partiton</para>
-<programlisting>
-/dev/sdb1 /mnt/sdb1 xfs noatime,nodiratime,nobarrier,logbufs=8 0 0
-</programlisting>
-<para>If you have a loopback file</para>
-<programlisting>
-/srv/swift-disk /mnt/sdb1 xfs loop,noatime,nodiratime,nobarrier,logbufs=8 0 0
-</programlisting>
-<para>Let's now mount the storage device and create directories (which would act as storage nodes) and provide appropriate permissions and ownerships (user:group format) for them. I have set the ownership to swift:swift for all relevant files.</para>
-<programlisting>
-sudo mount /mnt/sdb1
-sudo mkdir /mnt/sdb1/1 /mnt/sdb1/2 /mnt/sdb1/3 /mnt/sdb1/4
-sudo chown swift:swift /mnt/sdb1/*
-sudo ln -s /mnt/sdb1/1 /srv/1
-sudo ln -s /mnt/sdb1/2 /srv/2
-sudo ln -s /mnt/sdb1/3 /srv/3
-sudo ln -s /mnt/sdb1/4 /srv/4
-sudo mkdir -p /etc/swift/object-server /etc/swift/container-server /etc/swift/account-server /srv/1/node/sdb1 /srv/2/node/sdb2 /srv/3/node/sdb3 /srv/4/node/sdb4 /var/run/swift
-sudo chown -R swift:swift /etc/swift /srv/[1-4]/
-</programlisting>
-<para>Append the following lines to /etc/rc.local just before the "exit 0":</para>
-<programlisting>
-mkdir /var/run/swift
-chown swift:swift /var/run/swift
-</programlisting>
-</section>
-<section xml:id="Configuring_rsync">
-<title>Configuring Rsync</title>
-<para>Rsync is responsible for maintaining object replicas. It is used by various swift services to maintain consistency of objects and perform updation operations. It is configured for all the storage nodes.</para>
-<para>Create /etc/rsyncd.conf file and add the following lines to it:</para>
-<programlisting>
+<para>Create a directory /mnt/swift_backend that can be used as a mount point to the partion tha we created.</para>
+<programlisting>
+sudo mkdir /mnt/swift_backend
+</programlisting>
+<para>Make it mount on boot by appending this to /etc/fstab.</para>
+<programlisting>
+/srv/swift-disk /mnt/swift_backend xfs loop,noatime,nodiratime,nobarrier,logbufs=8 0 0
+</programlisting>
+</section>
+<section xml:id="Using_the_backend-d2s750">
+<title>Using the backend</title>
+<para>Now before mounting the backend that will be used, create some nodes to be used as storage devices and set ownership to 'swift' user and group.</para>
+<programlisting>
+sudo mount /mnt/swift_backend
+pushd /mnt/swift_backend
+sudo mkdir node1 node2 node3 node4
+popd
+</programlisting>
+<programlisting>
+sudo chown swift.swift /mnt/swift_backend/*
+</programlisting>
+<programlisting>
+for i in {1..4}; do sudo ln -s /mnt/swift_backend/node$i /srv/node$i; done;
+</programlisting>
+<programlisting>
+sudo mkdir -p /etc/swift/account-server /etc/swift/container-server /etc/swift/object-server /srv/node1/device /srv/node2/device /srv/node3/device /srv/node4/device
+sudo mkdir /run/swift
+sudo chown -L -R swift.swift /etc/swift /srv/node[1-4]/ /run/swift
+</programlisting>
+<para>Append the following lines in /etc/rc.local just before "exit 0";. This will be run everytime the system starts.</para>
+<programlisting>
+mkdir /run/swift
+chown swift.swift /run/swift
+</programlisting>
+</section>
+</section>
+<section xml:id="Configure_Rsync-d2s750">
+<title>Configure Rsync</title>
+<para>Rsync is responsible for maintaining object replicas. It is used by various swift services to maintain consistency of objects and perform updation operations. It is configured for all the storage nodes.</para>
+<para>Set RSYNC_ENABLE=true in /etc/default/rsync.</para>
+<para>Modify /etc/rsyncd.conf as follows:</para>
+<programlisting>
+# General stuff
 uid = swift
 gid = swift
 log file = /var/log/rsyncd.log
-pid file = /var/run/rsyncd.pid
+pid file = /run/rsyncd.pid
 address = 127.0.0.1
 
+# Account Server replication settings
+
 [account6012]
 max connections = 25
-path = /srv/1/node/
+path = /srv/node1/
 read only = false
-lock file = /var/lock/account6012.lock
+lock file = /run/lock/account6012.lock
 
 [account6022]
 max connections = 25
-path = /srv/2/node/
+path = /srv/node2/
 read only = false
-lock file = /var/lock/account6022.lock
+lock file = /run/lock/account6022.lock
 
 [account6032]
 max connections = 25
-path = /srv/3/node/
+path = /srv/node3/
 read only = false
-lock file = /var/lock/account6032.lock
+lock file = /run/lock/account6032.lock
 
 [account6042]
 max connections = 25
-path = /srv/4/node/
+path = /srv/node4/
 read only = false
-lock file = /var/lock/account6042.lock
+lock file = /run/lock/account6042.lock
 
+# Container server replication settings
 
 [container6011]
 max connections = 25
-path = /srv/1/node/
+path = /srv/node1/
 read only = false
-lock file = /var/lock/container6011.lock
+lock file = /run/lock/container6011.lock
 
 [container6021]
 max connections = 25
-path = /srv/2/node/
+path = /srv/node2/
 read only = false
-lock file = /var/lock/container6021.lock
+lock file = /run/lock/container6021.lock
 
 [container6031]
 max connections = 25
-path = /srv/3/node/
+path = /srv/node3/
 read only = false
-lock file = /var/lock/container6031.lock
+lock file = /run/lock/container6031.lock
 
 [container6041]
 max connections = 25
-path = /srv/4/node/
+path = /srv/node4/
 read only = false
-lock file = /var/lock/container6041.lock
+lock file = /run/lock/container6041.lock
 
+# Object Server replication settings
 
 [object6010]
 max connections = 25
-path = /srv/1/node/
+path = /srv/node1/
 read only = false
-lock file = /var/lock/object6010.lock
+lock file = /run/lock/object6010.lock
 
 [object6020]
 max connections = 25
-path = /srv/2/node/
+path = /srv/node2/
 read only = false
-lock file = /var/lock/object6020.lock
+lock file = /run/lock/object6020.lock
 
 [object6030]
 max connections = 25
-path = /srv/3/node/
+path = /srv/node3/
 read only = false
-lock file = /var/lock/object6030.lock
+lock file = /run/lock/object6030.lock
 
 [object6040]
 max connections = 25
-path = /srv/4/node/
+path = /srv/node4/
 read only = false
-lock file = /var/lock/object6040.lock
+lock file = /run/lock/object6040.lock
 </programlisting>
-<para>Set RSYNC_ENABLE=true in /etc/default/rsync and then restart the rsync service.</para>
+<para>Restart rsync.</para>
 <programlisting>
-service rsync restart
+sudo service rsync restart
 </programlisting>
 </section>
-<section xml:id="Swift_hash_configuration">
-<title>Swift Configuration</title>
+<section xml:id="Configure_Swift_Components-d2s752">
+<title>Configure Swift Components</title>
+<para>General server configuration options can be found in http://swift.openstack.org/deployment_guide.html. If the swift-doc package is installed it can also be viewed in the /usr/share/doc/swift-doc/html directory. Python uses paste.deploy to manage configuration. Default configuration options are set in the [DEFAULT] section, and any options specified there can be overridden in any of the other sections BUT ONLY BY USING THE SYNTAX set option_name = value.</para>
+<para>Here is a sample paste.deploy configuration for reference:</para>
+<programlisting>
+[DEFAULT]
+name1 = globalvalue
+name2 = globalvalue
+name3 = globalvalue
+set name4 = globalvalue
+
+[pipeline:main]
+pipeline = myapp
+
+[app:myapp]
+use = egg:mypkg#myapp
+name2 = localvalue
+set name3 = localvalue
+set name5 = localvalue
+name6 = localvalue
+</programlisting>
 <para>Create and edit /etc/swift/swift.conf and add the following lines to it:</para>
 <programlisting>
 [swift-hash]
-# random unique (preferably alphanumeric) string that can never change (DO NOT LOSE)
-swift_hash_path_suffix = {place_random_unique_string_here}
+# random unique string that can never change (DO NOT LOSE). I'm using 03c9f48da2229770. 
+# od -t x8 -N 8 -A n &lt; /dev/random
+# The above command can be used to generate random a string.
+swift_hash_path_suffix = 03c9f48da2229770
 </programlisting>
-<para>You will need the random string when you add more nodes to the setup. So never loose the string.</para>
+<para>You will need the random string when you add more nodes to the setup. So never lose the string.</para>
 <para>You can generate a random string by running the following command:</para>
 <programlisting>
 od -t x8 -N 8 -A n &lt; /dev/random
 </programlisting>
-</section>
-<section xml:id="Proxy_server_configuration">
-<title>Proxy Server Configuration</title>
-<para>Create and edit /etc/swift/proxy-server.conf and add the following lines to the file:</para>
+<section xml:id="Configure_Swift_Proxy_Server-d2s752">
+<title>Configure Swift Proxy Server</title>
+<para>Proxy server acts as the gatekeeper to swift. It takes the responsibility of authenticating the user. Authentication verifies that a request actually comes from who it says it does. Authorization verifies the ‘who’ has access to the resource(s) the request wants. Authorization is done by identity services like keystone. Create and edit /etc/swift/proxy-server.conf and add the following lines.</para>
 <programlisting>
 [DEFAULT]
 bind_port = 8080
 user = swift
-log_facility = LOG_LOCAL1
+swift_dir = /etc/swift
 
 [pipeline:main]
-pipeline = healthcheck cache tempauth proxy-server
+# Order of execution of modules defined below
+pipeline = catch_errors healthcheck cache authtoken keystone proxy-server
 
 [app:proxy-server]
 use = egg:swift#proxy
 allow_account_management = true
 account_autocreate = true
-
-[filter:tempauth]
-use = egg:swift#tempauth
-user_admin_admin = admin .admin .reseller_admin
-user_test_tester = testing .admin
+set log_name = swift-proxy
+set log_facility = LOG_LOCAL0
+set log_level = INFO
+set access_log_name = swift-proxy
+set access_log_facility = SYSLOG
+set access_log_level = INFO
+set log_headers = True
+account_autocreate = True
 
 [filter:healthcheck]
 use = egg:swift#healthcheck
 
+[filter:catch_errors]
+use = egg:swift#catch_errors
+
 [filter:cache]
 use = egg:swift#memcache
+set log_name = cache
+
+[filter:authtoken]
+paste.filter_factory = keystone.middleware.auth_token:filter_factory
+auth_protocol = http
+auth_host = 127.0.0.1
+auth_port = 35357
+auth_token = admin
+service_protocol = http
+service_host = 127.0.0.1
+service_port = 5000
+admin_token = admin
+admin_tenant_name = service
+admin_user = swift
+admin_password = swift
+delay_auth_decision = 0
+
+[filter:keystone]
+paste.filter_factory = keystone.middleware.swift_auth:filter_factory
+operator_roles = admin, swiftoperator
+is_admin = true
 </programlisting>
-<para>Note: You can find sample configuration files at the "etc" directory in the source. If you used apt-get to install swift, the configuration samples can be found at "/usr/share/doc/swift/"</para>
+<para>Note: You can find sample configuration files at the "etc" directory in the source. Some documentation can be found under "/usr/share/doc/swift-doc/html" if you had installed the swift-doc package using apt-get.</para>
 </section>
-<section xml:id="Account_server_configuration">
-<title>Account Server Configuration</title>
-<para>Create an account server configuration file for node #1: /etc/swift/account-server/1.conf and add the following lines to the file</para>
-<programlisting>
-[DEFAULT]
-devices = /srv/1/node
+<section xml:id="Configure_Swift_Account_Server-d2s752">
+<title>Configure Swift Account Server</title>
+<para>The default swift account server configuration is /etc/swift/account-server.conf.</para>
+<programlisting>
+[DEFAULT]
+bind_ip = 0.0.0.0
+workers = 2
+
+[pipeline:main]
+pipeline = account-server
+
+[app:account-server]
+use = egg:swift#account
+
+[account-replicator]
+
+[account-auditor]
+
+[account-reaper]
+</programlisting>
+<para>Account server configuration files are also looked up under /etc/swift/account-server.conf. Here we can create several account server configuration files each of which would correspond to a device under /srv. The files can be named 1.conf, 2.conf and so on. Here are the contents of /etc/swift/account-server/1.conf:</para>
+<programlisting>
+[DEFAULT]
+devices = /srv/node1
 mount_check = false
 bind_port = 6012
 user = swift
@@ -584,26 +840,46 @@
 use = egg:swift#account
 
 [account-replicator]
-vm_test_mode = yes
+vm_test_mode = no
 
 [account-auditor]
 
 [account-reaper]
 </programlisting>
-<para>We need to create the configuration for the rest of the three virtual nodes (/srv/2/node, /srv/3/node, /srv/4/node ) as well. So we simply make three more copies of 1.conf and set unique bind ports for the rest of the nodes (6022. 6032 and 6042) and different local log values (LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5).</para>
+<para>For the other devices, (/srv/node2, /srv/node3, /srv/node4), we create 2.conf, 3.conf and 4.conf. So we make three more copies of 1.conf and set unique bind ports for the rest of the nodes (6022, 6032 and 6042) and different local log values (LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5).</para>
 <programlisting>
 sudo cp /etc/swift/account-server/1.conf /etc/swift/account-server/2.conf
 sudo cp /etc/swift/account-server/1.conf /etc/swift/account-server/3.conf
 sudo cp /etc/swift/account-server/1.conf /etc/swift/account-server/4.conf
+sudo sed -i 's/6012/6022/g;s/LOCAL2/LOCAL3/g;s/node1/node2/g' /etc/swift/account-server/2.conf
+sudo sed -i 's/6012/6032/g;s/LOCAL2/LOCAL4/g;s/node1/node3/g' /etc/swift/account-server/3.conf
+sudo sed -i 's/6012/6042/g;s/LOCAL2/LOCAL5/g;s/node1/node4/g' /etc/swift/account-server/4.conf
 </programlisting>
-<para>Now we need to edit the files 2.conf, etc. created by the above command and edit the bind port number and local log values.</para>
 </section>
-<section xml:id="Container_server_configuration">
-<title>Container Server Configuration</title>
-<para>Create a container server configuration file for node #1: /etc/swift/container-server/1.conf and add the following lines to the file</para>
-<programlisting>
-[DEFAULT]
-devices = /srv/1/node
+<section xml:id="Configure_Swift_Container_Server-d2s754">
+<title>Configure Swift Container Server</title>
+<para>The default swift container server configuration is /etc/swift/container-server.conf.</para>
+<programlisting>
+[DEFAULT]
+bind_ip = 0.0.0.0
+workers = 2
+
+[pipeline:main]
+pipeline = container-server
+
+[app:container-server]
+use = egg:swift#container
+
+[container-replicator]
+
+[container-updater]
+
+[container-auditor]
+</programlisting>
+<para>Container server configuration files are also looked up under /etc/swift/container-server.conf. Here we can create several container server configuration files each of which would correspond to a device under /srv. The files can be named 1.conf, 2.conf and so on. Here are the contents of /etc/swift/container-server/1.conf:</para>
+<programlisting>
+[DEFAULT]
+devices = /srv/node1
 mount_check = false
 bind_port = 6011
 user = swift
@@ -616,28 +892,39 @@
 use = egg:swift#container
 
 [container-replicator]
-vm_test_mode = yes
+vm_test_mode = no
 
 [container-updater]
 
 [container-auditor]
-
 [container-sync]
 </programlisting>
-<para>We need to create the configuration for the rest of the three virtual nodes (/srv/2/node, /srv/3/node, /srv/4/node ) as well. So we simply make three more copies of 1.conf and set unique bind ports for the rest of the nodes (6021, 6031 and 6041) and different local log values (LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5).</para>
-<programlisting>
-sudo cp /etc/swift/container-server/1.conf /etc/swift/container-server/2.conf
-sudo cp /etc/swift/container-server/1.conf /etc/swift/container-server/3.conf
-sudo cp /etc/swift/container-server/1.conf /etc/swift/container-server/4.conf
-</programlisting>
-<para>Now we need to edit the files 2.conf, etc. created by the above command and edit the bind port number and local log values.</para>
+<para>For the other devices, (/srv/node2, /srv/node3, /srv/node4), we create 2.conf, 3.conf and 4.conf. So we make three more copies of 1.conf and set unique bind ports for the rest of the nodes (6021, 6031 and 6041) and different local log values (LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5).</para>
 </section>
-<section xml:id="Object_server_configuration">
-<title>Object Server Configuration</title>
-<para>Create an object server configuration file for node #1: /etc/swift/object-server/1.conf and add the following lines to the file</para>
-<programlisting>
-[DEFAULT]
-devices = /srv/1/node
+<section xml:id="Configure_Swift_Object_Server-d2s756">
+<title>Configure Swift Object Server</title>
+<para>The default swift object server configuration is /etc/swift/object-server.conf.</para>
+<programlisting>
+[DEFAULT]
+bind_ip = 0.0.0.0
+workers = 2
+
+[pipeline:main]
+pipeline = object-server
+
+[app:object-server]
+use = egg:swift#object
+
+[object-replicator]
+
+[object-updater]
+
+[object-auditor]
+</programlisting>
+<para>Object server configuration files are also looked up under /etc/swift/object-server.conf. Here we can create several object server configuration files each of which would correspond to a device under /srv. The files can be named 1.conf, 2.conf and so on. Here are the contents of /etc/swift/object-server/1.conf:</para>
+<programlisting>
+[DEFAULT]
+devices = /srv/node1
 mount_check = false
 bind_port = 6010
 user = swift
@@ -650,123 +937,90 @@
 use = egg:swift#object
 
 [object-replicator]
-vm_test_mode = yes
+vm_test_mode = no
 
 [object-updater]
 
 [object-auditor]
 </programlisting>
-<para>We need to create the configuration for the rest of the three virtual nodes (/srv/2/node, /srv/3/node, /srv/4/node ) as well. So we simply make three more copies of 1.conf and set unique bind ports for the rest of the nodes (6020, 6030 and 6040) and different local log values (LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5).</para>
-<programlisting>
-sudo cp /etc/swift/object-server/1.conf /etc/swift/object-server/2.conf
-sudo cp /etc/swift/object-server/1.conf /etc/swift/object-server/3.conf
-sudo cp /etc/swift/object-server/1.conf /etc/swift/object-server/4.conf
-</programlisting>
-<para>Now we need to edit the files 2.conf, etc. created by the above command and edit the bind port number and local log values.</para>
+<para>For the other devices, (/srv/node2, /srv/node3, /srv/node4), we create 2.conf, 3.conf and 4.conf. So we make three more copies of 1.conf and set unique bind ports for the rest of the nodes (6020, 6030 and 6040) and different local log values (LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5).</para>
 </section>
-<section xml:id="Building_the_rings">
-<title>Building the rings</title>
-<para>Rings are important components of Swift. Run the following commands in the same order for building the rings:</para>
+<section xml:id="Configure_Swift_Rings-d2s758">
+<title>Configure Swift Rings</title>
+<para>Ring is an important component of swift. It maintains the information about the physical location of objects, their replicas and devices. We now create the ring builder files corresponding to object service, container service and account service.</para>
+<para>NOTE: We need to be in the /etc/swift directory when executing the following commands.</para>
 <programlisting>
 pushd /etc/swift
 sudo swift-ring-builder object.builder create 18 3 1
-sudo swift-ring-builder object.builder add z1-127.0.0.1:6010/sdb1 1
-sudo swift-ring-builder object.builder add z2-127.0.0.1:6020/sdb2 1
-sudo swift-ring-builder object.builder add z3-127.0.0.1:6030/sdb3 1
-sudo swift-ring-builder object.builder add z4-127.0.0.1:6040/sdb4 1
+sudo swift-ring-builder container.builder create 18 3 1
+sudo swift-ring-builder account.builder create 18 3 1
+</programlisting>
+<para>The numbers indicate the desired number of partitions, replicas and the time in hours to restrict moving a partition more than once. See the man page for swift-ring-builder for more information.</para>
+<para>Now we add zones and balance the rings. The syntax is as follows:</para>
+<programlisting>
+swift-ring-builder &lt;builder_file&gt; add &lt;zone&gt;-&lt;ip_address&gt;:&lt;port&gt;/&lt;device&gt; &lt;weight&gt;
+</programlisting>
+<para>Execute the following commands to add the zones and rebalance the ring.</para>
+<programlisting>
+sudo swift-ring-builder object.builder add z1-127.0.0.1:6010/device 1
+sudo swift-ring-builder object.builder add z2-127.0.0.1:6020/device 1
+sudo swift-ring-builder object.builder add z3-127.0.0.1:6030/device 1
+sudo swift-ring-builder object.builder add z4-127.0.0.1:6040/device 1
 sudo swift-ring-builder object.builder rebalance
-sudo swift-ring-builder container.builder create 18 3 1
-sudo swift-ring-builder container.builder add z1-127.0.0.1:6011/sdb1 1
-sudo swift-ring-builder container.builder add z2-127.0.0.1:6021/sdb2 1
-sudo swift-ring-builder container.builder add z3-127.0.0.1:6031/sdb3 1
-sudo swift-ring-builder container.builder add z4-127.0.0.1:6041/sdb4 1
+sudo swift-ring-builder container.builder add z1-127.0.0.1:6011/device 1
+sudo swift-ring-builder container.builder add z2-127.0.0.1:6021/device 1
+sudo swift-ring-builder container.builder add z3-127.0.0.1:6031/device 1
+sudo swift-ring-builder container.builder add z4-127.0.0.1:6041/device 1
 sudo swift-ring-builder container.builder rebalance
-sudo swift-ring-builder account.builder create 18 3 1
-sudo swift-ring-builder account.builder add z1-127.0.0.1:6012/sdb1 1
-sudo swift-ring-builder account.builder add z2-127.0.0.1:6022/sdb2 1
-sudo swift-ring-builder account.builder add z3-127.0.0.1:6032/sdb3 1
-sudo swift-ring-builder account.builder add z4-127.0.0.1:6042/sdb4 1
+sudo swift-ring-builder account.builder add z1-127.0.0.1:6012/device 1
+sudo swift-ring-builder account.builder add z2-127.0.0.1:6022/device 1
+sudo swift-ring-builder account.builder add z3-127.0.0.1:6032/device 1
+sudo swift-ring-builder account.builder add z4-127.0.0.1:6042/device 1
 sudo swift-ring-builder account.builder rebalance
 </programlisting>
 </section>
-<section xml:id="Running_Swift_services">
-<title>Running_Swift_Services</title>
+</section>
+<section xml:id="Starting_Swift_services-d2s760">
+<title>Starting Swift services</title>
+<para>To start swift and the REST API, run the following commands.</para>
 <programlisting>
 sudo swift-init main start
-</programlisting>
-<para>To start the REST API do the following:</para>
-<programlisting>
 sudo swift-init rest start
 </programlisting>
 </section>
-<section xml:id="Testing_Swift">
+<section xml:id="Testing_Swift-d2s762">
 <title>Testing Swift</title>
-<para>As normal user, execute the following command</para>
-<programlisting>
-curl -v -H 'X-Storage-User: admin:admin' -H 'X-Storage-Pass: admin' http://127.0.0.1:8080/auth/v1.0
-</programlisting>
-<para>The output should look like:</para>
-<programlisting>
-* About to connect() to 127.0.0.1 port 8080 (#0)
-*   Trying 127.0.0.1... connected
-* Connected to 127.0.0.1 (127.0.0.1) port 8080 (#0)
-&gt; GET /auth/v1.0 HTTP/1.1
-&gt; User-Agent: curl/7.21.6 (i686-pc-linux-gnu) libcurl/7.21.6 OpenSSL/1.0.0e zlib/1.2.3.4 libidn/1.22 librtmp/2.3
-&gt; Host: 127.0.0.1:8080
-&gt; Accept: */*
-&gt; X-Storage-User: admin:admin
-&gt; X-Storage-Pass: admin
-&gt; 
-&lt; HTTP/1.1 200 OK
-&lt; X-Storage-Url: http://127.0.0.1:8080/v1/AUTH_admin
-&lt; X-Storage-Token: AUTH_tk441617bc550f4bb7bf51b4dc16800900
-&lt; X-Auth-Token: AUTH_tk441617bc550f4bb7bf51b4dc16800900
-&lt; Content-Length: 0
-&lt; Date: Fri, 14 Oct 2011 15:25:15 GMT
-&lt; 
-* Connection #0 to host 127.0.0.1 left intact
-* Closing connection #0
-</programlisting>
-<para>If the above command did not throw any error and gave you an output similar to the one above, then the user accounts are being authenticated fine. Make note of the X-Auth-Token and the X-Storage-Url. Then give the following command to check if you can perform a GET operation successfully:</para>
-<programlisting>
-curl -v -H 'X-Auth-Token: AUTH_tk441617bc550f4bb7bf51b4dc16800900' http://127.0.0.1:8080/v1/AUTH_admin
-</programlisting>
-<para>The output should be similar as follows:</para>
-<programlisting>
-* About to connect() to 127.0.0.1 port 8080 (#0)
-*   Trying 127.0.0.1... connected
-* Connected to 127.0.0.1 (127.0.0.1) port 8080 (#0)
-&gt; GET /v1/AUTH_admin HTTP/1.1
-&gt; User-Agent: curl/7.21.6 (i686-pc-linux-gnu) libcurl/7.21.6 OpenSSL/1.0.0e zlib/1.2.3.4 libidn/1.22 librtmp/2.3
-&gt; Host: 127.0.0.1:8080
-&gt; Accept: */*
-&gt; X-Auth-Token: AUTH_tk441617bc550f4bb7bf51b4dc16800900
-&gt; 
-&lt; HTTP/1.1 204 No Content
-&lt; X-Account-Object-Count: 0
-&lt; X-Account-Bytes-Used: 0
-&lt; X-Account-Container-Count: 0
-&lt; Accept-Ranges: bytes
-&lt; Content-Length: 0
-&lt; Date: Fri, 14 Oct 2011 15:28:15 GMT
-&lt; 
-* Connection #0 to host 127.0.0.1 left intact
-* Closing connection #0
-</programlisting>
-</section>
-</section>
-</section>
-<section xml:id="Server_2-d1e1059">
+<para>Swift can be tested using the swift command or the dashboard web interface (Horizon). Firstly, make sure that the ownership for /etc/swift directory is set to swift.swift.</para>
+<programlisting>
+sudo chown -R swift.swift /etc/swift
+</programlisting>
+<para>Then run the following command and verify if you get the appropriate account information. The number of containers and objects stored within are displayed as well.</para>
+<programlisting>
+swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swift -K swift stat
+StorageURL: http://127.0.0.1:8080/v1/AUTH_c7970080576646c6959ee35970cf3199
+Auth Token: ba9df200a92d4a5088dcd6b7dcc19c0d
+   Account: AUTH_c7970080576646c6959ee35970cf3199
+Containers: 1
+   Objects: 1
+     Bytes: 77
+Accept-Ranges: bytes
+X-Trans-Id: tx11c64e218f984749bc3ec37ea46280ee
+</programlisting>
+</section>
+</section>
+</section>
+
+<section xml:id="Server_2-d2s762">
 <title>Server2</title>
- <para>This server runs nova-compute and all the virtual machines and hypervisor. You can also bundle images on Server2.</para>
+<para>This server runs only nova-compute service.</para>
 <section xml:id="BaseOS-d1e1064">
 <title>BaseOS</title>
-<para>Install 64-bit version of Oneiric Server</para>
+<para>Install 64 bit version of Ubuntu server 12.04</para>
 </section>
-<section xml:id="Networking_Configuration-d1e1073">
-<title>Networking Configuration</title>
+<section xml:id="Network_Configuration-d1e1073">
+<title>Network Configuration</title>
 <para>Install bridge-utils:</para>
-<programlisting>sudo apt-get install -y bridge-utils</programlisting>
+<programlisting>sudo apt-get install bridge-utils</programlisting>
 <para>Edit the /etc/network/interfaces file so as to looks like this:</para>
 <programlisting>
 auto lo
@@ -778,7 +1032,7 @@
 		netmask 255.255.255.0
 		broadcast 10.10.10.255
 		gateway 10.10.10.1
-		dns-nameservers 10.10.10.100
+		dns-nameservers 10.10.8.3
 
 auto eth1
 iface eth1 inet static
@@ -787,129 +1041,182 @@
 		network 192.168.3.0
 		broadcast 192.168.3.255
 </programlisting>
-<para>Restart the network now</para>
+<para>Restart the network.</para>
 <programlisting>sudo /etc/init.d/networking restart</programlisting>
 </section>
 <section xml:id="NTP_Client-d1e1098">
 <title>NTP Client</title>
 <para>Install NTP package.</para>
-<programlisting>sudo apt-get install -y ntp</programlisting>
+<programlisting>sudo apt-get install ntp</programlisting>
 <para>Open the file /etc/ntp.conf and add the following line to sync to server1.</para>
 <programlisting>server 10.10.10.2</programlisting>
 <para>Restart NTP service to make the changes effective</para>
-<programlisting>sudo /etc/init.d/ntp restart</programlisting>
+<programlisting>sudo service ntp restart</programlisting>
 </section>
 <section xml:id="Nova_Components_nova-compute_alone_-d1e1123">
 <title>Nova Components (nova-compute alone)</title>
 <para>Install the nova-components and dependencies.</para>
 <programlisting>
-sudo apt-get install -y nova-common python-nova nova-compute vlan
-</programlisting>
-<para>Install euca tools, for command line tools</para>
-<programlisting>sudo apt-get install -y euca2ools</programlisting>
-<para>Install unzip for extracting archives</para>
-<programlisting>
-sudo apt-get install -y unzip
-</programlisting>
-<para>Edit the /etc/nova/nova.conf file to look like this. This file is essentially similar to the configuration file (/etc/nova/nova.conf) of Server1</para>
+sudo apt-get install nova-compute
+</programlisting>
+<para>Edit the /etc/nova/nova.conf file to look like this. This file is identical to the configuration file (/etc/nova/nova.conf) of Server1</para>
 <programlisting>
 --dhcpbridge_flagfile=/etc/nova/nova.conf
 --dhcpbridge=/usr/bin/nova-dhcpbridge
 --logdir=/var/log/nova
 --state_path=/var/lib/nova
---lock_path=/var/lock/nova
---state_path=/var/lib/nova
---verbose
+--lock_path=/run/lock/nova
+--allow_admin_api=true
+--use_deprecated_auth=false
+--auth_strategy=keystone
+--scheduler_driver=nova.scheduler.simple.SimpleScheduler
 --s3_host=10.10.10.2
+--ec2_host=10.10.10.2
 --rabbit_host=10.10.10.2
 --cc_host=10.10.10.2
---ec2_url=http://10.10.10.2:8773/services/Cloud
---network_size=8
---FAKE_subdomain=ec2
+--nova_url=http://10.10.10.2:8774/v1.1/
 --routing_source_ip=10.10.10.2
+--glance_api_servers=10.10.10.2:9292
+--image_service=nova.image.glance.GlanceImageService
+--iscsi_ip_prefix=192.168.4
 --sql_connection=mysql://novadbadmin:novasecret@10.10.10.2/nova
---glance_api_servers=192.168.3.1:9292
---image_service=nova.image.glance.GlanceImageService
---iscsi_ip_prefix=192.168.
---vlan_interface=eth1
+--ec2_url=http://10.10.10.2:8773/services/Cloud
+--keystone_ec2_url=http://10.10.10.2:5000/v2.0/ec2tokens
+--api_paste_config=/etc/nova/api-paste.ini
+--libvirt_type=kvm
+--libvirt_use_virtio_for_bridges=true
+--start_guests_on_host_boot=true
+--resume_guests_state_on_host_boot=true
+# vnc specific configuration
+--novnc_enabled=true
+--novncproxy_base_url=http://10.10.10.2:6080/vnc_auto.html
+--vncserver_proxyclient_address=10.10.10.2
+--vncserver_listen=10.10.10.2
+# network specific settings
+--network_manager=nova.network.manager.FlatDHCPManager
+--public_interface=eth0
+--flat_interface=eth1
+--flat_network_bridge=br100
+--fixed_range=192.168.4.1/27
+--floating_range=10.10.10.2/27
+--network_size=32
+--flat_network_dhcp_start=192.168.4.33
+--flat_injected=False
+--force_dhcp_release
+--iscsi_helper=tgtadm
+--connection_type=libvirt
+--root_helper=sudo nova-rootwrap
+--verbose
 </programlisting>
 <para>Restart nova-compute on Server2.</para>
 <programlisting>sudo service restart nova-compute</programlisting>
-<para>On Server1, check if the second compute node (Server2) is detected by running:</para>
-<programlisting>euca-describe-availability-zones verbose</programlisting>
-<para>If you see something like the following with all components happy, it means that the set up is ready to be used.</para>
+<para>Check if the second compute node (Server2) is detected by running:</para>
+<programlisting>sudo nova-manage service list</programlisting>
+<para>If you see an output similar to the following, it means that the set up is ready to be used.</para>
 <programlisting>
-AVAILABILITYZONE    nova available
-AVAILABILITYZONE    |- server1
-AVAILABILITYZONE    | |- nova-compute       enabled :-) 2011-09-30 09:26:04
-AVAILABILITYZONE    | |- nova-scheduler     enabled :-) 2011-09-30 09:26:04
-AVAILABILITYZONE    | |- nova-network       enabled :-) 2011-09-30 09:26:07
-AVAILABILITYZONE    | |- nova-volume        enabled :-) 2011-09-30 09:26:06
-AVAILABILITYZONE    |- server2
-AVAILABILITYZONE    | |- nova-compute       enabled :-)  2011-09-30 09:26:05
+sudo nova-manage service list
+Binary           Host              Zone             Status     State Updated_At
+nova-network     server1           nova             enabled    :-)   2012-04-20 08:58:43
+nova-scheduler   server1           nova             enabled    :-)   2012-04-20 08:58:44
+nova-volume      server1           nova             enabled    :-)   2012-04-20 08:58:44
+nova-compute     server1           nova             enabled    :-)   2012-04-20 08:58:45
+nova-cert        server1           nova             enabled    :-)   2012-04-20 08:58:43
+nova-compute     server2           nova             enabled    :-)   2012-04-21 10:22:27
 </programlisting>
-<para>Sometimes you may have XXX instead of the smiley. The XXX are displayed when the components are not time-synced. Ensure time synchronization across all components of your OpenStack deployment.</para>
-</section>
-</section>
-<section xml:id="Client1-d1e1155">
-<title>Client1</title>
-<section xml:id="BaseOS-d1e1160">
-<title>BaseOS</title>
-<para>Install 64-bit version of Oneiric Desktop</para>
-</section>
-<section xml:id="Networking_Configuration-d1e1169">
-<title>Networking Configuration</title>
-<para>Edit the /etc/network/interfaces file so as to looks like this:</para>
-<programlisting>
+</section>
+</section>
+
+    <section xml:id="Client1-d1e1155">
+      <title>Client1</title>
+      <section xml:id="BaseOS-d1e1160">
+        <title>BaseOS</title>
+        <para>Install 64-bit version of Ubuntu 12.04 Desktop</para>
+      </section>
+      <section xml:id="Networking_Configuration-d1e1169">
+        <title>Networking Configuration</title>
+        <para>Edit the /etc/network/interfaces file so as to looks
+          like this:</para>
+        <programlisting>
 auto lo
- iface lo inet loopback
+	iface lo inet loopback
 auto eth0
- iface eth0 inet static
- address 10.10.10.4
- netmask 255.255.255.0
- broadcast 10.10.10.255
- gateway 10.10.10.1
- dns-nameservers 10.10.10.100
-</programlisting>
-</section>
-<section xml:id="NTP_Client-d1e1181">
-<title>NTP Client</title>
-<para>Install NTP package.</para>
-<programlisting>sudo apt-get install -y ntp
-</programlisting>
-<para>Open the file /etc/ntp.conf and add the following line to sync to server1.</para>
-<programlisting>
+	iface eth0 inet static
+	address 10.10.10.4
+	netmask 255.255.255.0
+	broadcast 10.10.10.255
+	gateway 10.10.10.1
+	dns-nameservers 10.10.8.3
+</programlisting>
+      </section>
+
+      <section xml:id="NTP_Client-d1e1181">
+        <title>NTP Client</title>
+        <para>Install NTP package.</para>
+        <programlisting>sudo apt-get install -y ntp
+</programlisting>
+        <para>Open the file /etc/ntp.conf and add the following line
+          to sync to server1.</para>
+        <programlisting>
 server 10.10.10.2
 </programlisting>
-<para>Restart NTP service to make the changes effective</para>
-<programlisting>
-sudo /etc/init.d/ntp restart
-</programlisting>
-</section>
-<section xml:id="Client_Tools-d1e1206">
-<title>Client Tools</title>
-<para>As mentioned above, this is a desktop installation of Oneiric to be used for tasks such as bundling of images. It will also be used for managing the cloud infrastructure using euca2ools.</para>
-<para>Install euca tools, for command line tools</para>
-<programlisting>sudo apt-get install -y euca2ools</programlisting>
-<para>Install qemu-kvm</para>
-<programlisting>sudo apt-get install -y qemu-kvm</programlisting>
-<para>Download the credentials we created for localadmin to this machine:</para>
-<programlisting>
-mkdir /home/localadmin/creds
-cd /home/localadmin/creds
-scp localadmin@10.10.10.2:/home/localadmin/creds/novacreds.zip .
-unzip creds.zip
-</programlisting>
-<para>Source novarc file and see if connectivity to api server is working correctly:</para>
-<programlisting>
-source novarc
-euca-describe-availability-zones verbose
-</programlisting>
-<para>The output should be similar to what is shown above in the configuration section for Server1.</para>
-<para>Note: If you want to avoid manually sourcing the novarc file every time, the user can add the following line to the .profile file in his home directory:</para>
-<programlisting>
-source /home/localadmin/creds/novarc
-</programlisting>
-</section>
-</section>
-</chapter>
\ No newline at end of file
+        <para>Restart NTP service to make the changes effective</para>
+        <programlisting>
+sudo service ntp restart
+</programlisting>
+      </section>
+      <section xml:id="Client_Tools-d1e1206">
+        <title>Client Tools</title>
+        <para>As mentioned above, this is a desktop installation of
+          Ubuntu 12.04 to be used for tasks such as bundling of
+          images. It will also be used for managing the cloud
+          infrastructure using nova, glance and swift commandline
+          tools.</para>
+        <para>Install the required command line tools with the
+          following command:</para>
+        <programlisting>sudo apt-get install python-novaclient glance-client swift</programlisting>
+        <para>Install qemu-kvm</para>
+        <programlisting>sudo apt-get install qemu-kvm</programlisting>
+        <para>Export the following environment variables or add them
+          to your ~/.bashrc.</para>
+        <programlisting>
+export SERVICE_TOKEN=admin
+export OS_TENANT_NAME=admin
+export OS_USERNAME=admin
+export OS_PASSWORD=admin
+export OS_AUTH_URL="http://10.10.10.2:5000/v2.0/"
+export SERVICE_ENDPOINT=http://10.10.10.2:35357/v2.0
+</programlisting>
+        <para>Execute nova and glance commands to check the
+          connectivity to OpenStack setup.</para>
+        <programlisting>
+nova list
++--------------------------------------+------------+--------+----------------------+
+|                  ID                  |    Name    | Status |      Networks        |
++--------------------------------------+------------+--------+----------------------+
+| 25ee9230-6bb5-4eca-8808-e6b4e0348362 | myinstance | ACTIVE | private=192.168.4.35 |
+| c939cb2c-e662-46e5-bc31-453007442cf9 | myinstance1| ACTIVE | private=192.168.4.36 |
++--------------------------------------+------------+--------+----------------------+
+</programlisting>
+        <programlisting>
+glance index
+ID                                   Name          Disk     Container Size
+                                                   Format   Format
+------------------------------------ ------------------------------ ----------------
+65b9f8e1-cde8-40e7-93e3-0866becfb9d4 windows       qcow2    ovf       7580745728
+f147e666-990c-47e2-9caa-a5a21470cc4e debian        qcow2    ovf       932904960
+f3a8e689-02ed-460f-a587-dc868576228f opensuse      qcow2    ovf       1072300032
+aa362fd9-7c28-480b-845c-85a5c38ccd86 centoscli     qcow2    ovf       1611530240
+49f0ec2b-26dd-4644-adcc-2ce047e281c5 ubuntuimage   qcow2    ovf       1471807488
+</programlisting>
+      </section>
+      <section xml:id="Dashboard-d1e1208">
+        <title>OpenStack Dashboard</title>
+        <para>Start a browser and type the ip address of Server1 i.e,
+          http://10.10.10.2. You should see the dashboard login
+          screen. Login with the credentials username - admin and
+          password - admin to manage the OpenStack setup.</para>
+      </section>
+    </section>
+</section>
+</chapter>
+

=== modified file 'Instance.xml'
--- Instance.xml	2011-10-19 14:27:25 +0000
+++ Instance.xml	2012-05-09 21:52:21 +0000
@@ -3,14 +3,14 @@
 <section xml:id="Introduction-d1e1651">
 <title>Introduction</title>
 <para>An instance is a virtual machine provisioned by OpenStack on one of the nova-compute servers. 
-When you launch an instance, a series of steps are triggered on various components of the OpenStack. 
+When you launch an instance, a series of actions is triggered on various components of the OpenStack. 
 During the life cycles of an instance, it moves through various stages as shown in the diagram below:
 </para>
 <para>
 <mediaobject>
     <imageobject role="fo">
         <imagedata fileref="images/lifecycle.png"
-            format="PNG" scale="60"/>
+            format="PNG" scale="15"/>
     </imageobject>
     <imageobject role="html">
         <imagedata fileref="images/lifecyclehtml.png"
@@ -19,93 +19,120 @@
 </mediaobject></para>
 <para>The following interfaces can be used for managing instances in nova.</para>
 <itemizedlist>
-<listitem><para>Command line tools like euca2ools</para></listitem>
+<listitem><para>Nova commands</para></listitem>
+<listitem><para>Custom applications developed using Nova APIs</para></listitem>
 <listitem><para>Custom applications developed using EC2 APIs</para></listitem>
 </itemizedlist>
 </section>
-<section xml:id="Euca2ools-Command_Line_Tools-d1e1828">
-<title>Euca2ools-Command Line Tools</title>
-<para>Euca2ools from Eucalyptus provide a bunch of command line tools to manage the eucalyptus setup. These commands help you manage images, instances, storage, networking etc. A few commands related to managing the instances are given below.</para>
-<para>For a complete list of commands, see Appendix.</para>
-<section xml:id="Installation-d1e1839">
-
-<title>Installation</title>
-
-<programlisting>
-sudo apt-get install euca2ools
-</programlisting>
-</section>
+<section xml:id="OpenStack-Command_Line_Tools-d1e1828">
+<title>Openstack Command Line Tools</title>
+<para>Nova has a bunch of command line tools to manage the OpenStack setup. These commands help you manage images, instances, storage, networking etc. A few commands related to managing the instances are given below.</para>
+
 
 <section xml:id="Creation_of_Key_Pairs-d1e1848">
 <title>Creation of Key Pairs</title>
-<para>OpenStack expects the client tools to use 2 kinds of credentials. One set of credentials are called Access Key and Secret Key that all clients would need to use to make any requests to the Cloud Controller. Each user registered on the web interface has this set created for him. You can download it from the web interface as mentioned in the chapter on "Web Interface".</para>
+<para>OpenStack services are authenticated and authorized against keystone identity server. Keystone provides a token and a service catolog containing information about the endpoints of services to which a user is authorized. Each user has a token and service catalog created for them. This can be downloaded from the OpenStack Dashboard.</para>
 
-<para>You will also need to generate a keypair consisting of private key/public key to be able to launch instances on Eucalyptus. These keys are injected into the instances to make password-less SSH access to the instance possible. This depends on the way the necessary tools are bundled into the images. Please refer to the chapter on Image Management for more details. </para>
+<para>You will also need to generate a keypair consisting of private key/public key to be able to launch instances on OpenStack. These keys are injected into the instances to make password-less SSH access to the instance. This depends on the way the necessary tools are bundled into the images. Please refer to the chapter on "Image Management" for more details. </para>
 
 <para>Keypairs can also be generated using the following commands.</para>
 <programlisting>
-cd ~/creds
-euca-add-keypair mykey &gt; mykey.priv
-chmod 600 mykey.priv
+ssh-keygen
+cd .ssh
+nova keypair-add --pub_key id_rsa.pub mykey
 </programlisting>
-<para>This creates a new keypair called mykey. The private key mykey.priv is saved locally which can be used to connect to an instance launched with mykey as the keypair. euca-describe-keypairs command to list the available keypairs.</para><para>The output should like this:
-</para>
+<para>This creates a new keypair called mykey. The private key id_rsa is saved locally in ~/.ssh which can be used to connect to an instance launched using mykey as the keypair. You can see the available keypairs with nova keypair-list command.</para>
 <programlisting>
-uecadmin@client1:~$ euca-describe-keypairs
-KEYPAIR mykey   f7:ac:8e:f5:05:19:2b:31:28:8c:9b:d7:b8:07:0c:3c:b6:34:8f:79
-KEYPAIR helloworld      12:96:b3:21:34:8d:6a:3f:92:2e:2b:70:23:ff:7f:51:b5:b7:ad:37
-KEYPAIR ubuntu f6:af:9a:59:65:35:32:c4:3a:c4:62:0e:e1:44:0f:71:29:03:2d:91
-KEYPAIR lucid  74:04:70:33:ed:57:7a:30:36:1f:ca:c6:ec:d5:4f:10:34:1a:52:51
-KEYPAIR karmic   01:f9:aa:5f:4d:20:e2:53:d1:29:d0:0f:e2:f3:8c:21:91:70:7e:c8
+nova keypair-list
++-------+-------------------------------------------------+
+|  Name |                   Fingerprint                   |
++-------+-------------------------------------------------+
+| mykey  | b0:18:32:fa:4e:d4:3c:1b:c4:6c:dd:cb:53:29:13:82 |
+| mykey2 | b0:18:32:fa:4e:d4:3c:1b:c4:6c:dd:cb:53:29:13:82 |
++-------+-------------------------------------------------+
 </programlisting>
+<para>Also while executing 'ssh-keygen' you can specify a custom location and custom file names for the keypairs that you want to create.</para>
 <para>To delete an existing keypair:</para>
 <programlisting>
-euca-delete-keypair helloworld
+nova keypair-delete mykey2
 </programlisting>
-<para>The above tasks can be achieved using Hybridfox from the "Keypairs" tab.</para>
 </section>
 <section xml:id="Launch_and_manage_instances-d1e1885">
 <title>Launch and manage instances</title>
 <para>There are several commands that help in managing the instances. Here are a few examples:</para>
 <programlisting>
-$ euca-run-instances ami-00000003 -k mykey -t m1.tiny
-
-RESERVATION	r-f1ek1ojb	proj	default
-INSTANCE	i-00000005	ami-00000003			pending	mykey (proj, None)	0		m1.tiny	2011-10-19T12:48:04Z	unknown zone	ami-00000000	ami-00000000
-</programlisting>
-<programlisting>
-$ euca-describe-instances
-
-RESERVATION	r-f1ek1ojb	proj	default
-INSTANCE	i-00000005	ami-00000003	192.168.4.3	192.168.4.3	running	mykey (proj, Openstackvalidationserver1)	0		m1.tiny	2011-10-19T12:48:04Z	nova	ami-00000000	ami-00000000
-</programlisting>
-<programlisting>
-$ euca-reboot-instances i-00000005
-</programlisting>
-<programlisting>
-$ euca-terminate-instances i-00000005
-</programlisting>
-<programlisting>
-$ euca-run-instances ami-XXXXXXXX -k mykey
-</programlisting>
-<programlisting>
-$ euca-get-console-output i-00000005
-
-i-00000005
-2011-10-07T07:22:40.795Z
-[    0.000000] Initializing cgroup subsys cpuset
-[    0.000000] Initializing cgroup subsys cpu
-[    0.000000] Linux version 2.6.32-21-server (buildd@yellow) (gcc version 4.
-4.3 (Ubuntu 4.4.3-4ubuntu5) ) #32-Ubuntu SMP Fri Oct 07 09:17:34 UTC 2011 (Ub
-untu 2.6.32-21.32-server 2.6.32.11+drm33.2)
-.............
-</programlisting>
-<para>You can make password less ssh access to the instance as follows:</para>
-<programlisting>
-ssh -i mykey.priv user@192.168.4.3
+$ nova boot --flavor 1 --image 9bab7ce7-7523-4d37-831f-c18fbc5cb543 --key_name mykey myinstance
++-------------------------------------+--------------------------------------+
+|               Property              |                Value                 |
++-------------------------------------+--------------------------------------+
+| OS-DCF:diskConfig                   | MANUAL                               |
+| OS-EXT-SRV-ATTR:host                | None                                 |
+| OS-EXT-SRV-ATTR:hypervisor_hostname | None                                 |
+| OS-EXT-SRV-ATTR:instance_name       | instance-00000002                    |
+| OS-EXT-STS:power_state              | 0                                    |
+| OS-EXT-STS:task_state               | scheduling                           |
+| OS-EXT-STS:vm_state                 | building                             |
+| accessIPv4                          |                                      |
+| accessIPv6                          |                                      |
+| adminPass                           | FaUPM6EEBT8F                         |
+| config_drive                        |                                      |
+| created                             | 2012-05-02T19:29:59Z                 |
+| flavor                              | m1.tiny                              |
+| hostId                              |                                      |
+| id                                  | 25ee9230-6bb5-4eca-8808-e6b4e0348362 |
+| image                               | ubuntu                              |
+| key_name                            | mykey                                |
+| metadata                            | {}                                   |
+| name                                | myinstance                           |
+| progress                            | 0                                    |
+| status                              | BUILD                                |
+| tenant_id                           | 24da687e5d844657996bd5e93d06cb89     |
+| updated                             | 2012-05-02T19:29:59Z                 |
+| user_id                             | 2b64e5ed949145ce92e1fb47224740fe     |
++-------------------------------------+--------------------------------------+
+</programlisting>
+<programlisting>
+$ nova list
++--------------------------------------+------------+--------+----------------------+
+|                  ID                  |    Name    | Status |      Networks        |
++--------------------------------------+------------+--------+----------------------+
+| 25ee9230-6bb5-4eca-8808-e6b4e0348362 | myinstance | ACTIVE | private=192.168.4.35 |
+| c939cb2c-e662-46e5-bc31-453007442cf9 | myinstance1| ACTIVE | private=192.168.4.36 |
++--------------------------------------+------------+--------+----------------------+
+</programlisting>
+<programlisting>
+$ nova reboot 25ee9230-6bb5-4eca-8808-e6b4e0348362
+$ nova list
++--------------------------------------+------------+--------+----------------------+
+|                  ID                  |    Name    | Status |      Networks        |
++--------------------------------------+------------+--------+----------------------+
+| 25ee9230-6bb5-4eca-8808-e6b4e0348362 | myinstance | REBOOT | private=192.168.4.35 |
+| c939cb2c-e662-46e5-bc31-453007442cf9 | myinstance1| ACTIVE | private=192.168.4.34 |
++--------------------------------------+------------+--------+----------------------+
+</programlisting>
+<programlisting>
+$ nova delete 25ee9230-6bb5-4eca-8808-e6b4e0348362
+$ nova list
++--------------------------------------+------------+--------+----------------------+
+|                  ID                  |   Name     | Status |     Networks         |
++--------------------------------------+------------+--------+----------------------+
+| c939cb2c-e662-46e5-bc31-453007442cf9 | myinstance1| ACTIVE | private=192.168.4.34 |
++--------------------------------------+------------+--------+----------------------+
+
+</programlisting>
+<programlisting>
+$ nova console-log myinstance
+</programlisting>
+<para>For passwordless ssh access to the instance:</para>
+<programlisting>
+ssh -i &lt;private_key&gt; username@&lt;ip_address&gt;
 </programlisting>
 <para>VM type has implications for harddisk size, amount of RAM and number of CPUs allocated to the instance. Check the VM types available.</para>
-<programlisting>sudo nova-manage instance_type list</programlisting>
-</section>
-</section>
-</chapter>
\ No newline at end of file
+<programlisting>nova flavor-list</programlisting>
+<para>New flavours can be created with the command.</para>
+<programlisting>sudo nova-manage flavor create &lt;args&gt; [options]</programlisting>
+<para>A flavour can be deleted with the command.</para>
+<programlisting>sudo nova-manage flavor delete &lt;args&gt; [options]</programlisting>
+</section>
+</section>
+</chapter>

=== modified file 'Introduction.xml'
--- Introduction.xml	2011-10-19 14:27:25 +0000
+++ Introduction.xml	2012-05-09 21:52:21 +0000
@@ -9,21 +9,47 @@
 			<listitem><para>Platform as a Service (PaaS)</para></listitem>
 			<listitem><para>Software as a Service (SaaS)</para></listitem>
 		</itemizedlist>
-		<para>Amazon Web Services (AWS) is one of the major players providing IAAS. They have two popular services - Elastic Compute Cloud (EC2) and Simple Storage Service (S3). These services are available through web services.</para>
 	</section>
 	<section xml:id="OpenStack-d1e94">
 		<title>OpenStack</title>
-		<para>OpenStack is a collection of open source software projects that enterprises/service providers can use to setup and run their cloud compute and storage infrastructure. Rackspace and NASA are the key initial contributors to the stack. Rackspace contributed their "Cloud Files" platform to power the Object Storage part of the OpenStack, while NASA contributed their "Nebula" code to power the Compute part.  OpenStack consortium has managed to have more than 100 members including Canonical, Dell, Citrix etc. in less than a year.</para>
-		<para>OpenStack makes its services available through Amazon EC2/S3 compatible APIs and hence the client tools written for AWS can be used with OpenStack as well.</para>
-		<para>There are 3 main service families under OpenStack</para>
+		<para>OpenStack is a collection of open source software projects that enterprises/service providers can use to setup and run their cloud compute and storage infrastructure. Rackspace and NASA are the key initial contributors to the stack. Rackspace contributed their "Cloud Files" platform (code) to power the Object Storage part of the OpenStack, while NASA contributed their "Nebula" platform (code) to power the Compute part.  OpenStack consortium has managed to have more than 150 members including Canonical, Dell, Citrix etc.</para>
+		<para>There are 5 main service families under OpenStack</para>
 		<itemizedlist>
-			<listitem><para>Compute Infrastructure (Nova)</para></listitem>
-			<listitem><para>Storage Infrastructure (Swift)</para></listitem>
-			<listitem><para>Imaging Service (Glance)</para></listitem>
-		</itemizedlist>
+			<listitem><para>Nova - Compute Service</para></listitem>
+			<listitem><para>Swift - Storage Service</para></listitem>
+			<listitem><para>Glance - Imaging Service</para></listitem>
+			<listitem><para>Keystone - Identity Service</para></listitem>
+			<listitem><para>Horizon - UI Service</para></listitem>
+        </itemizedlist>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+			<imagedata fileref="images/architecture.png"
+				format="PNG" scale="12"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/architecturehtml.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+<para>The below diagram shows a simple representation of interaction between keystone and dashboard with the remaining OpenStack components.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+			<imagedata fileref="images/keystone_dashboard.png"
+				format="PNG" scale="9"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/keystone_dashboardhtml.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+
 <section xml:id="Open_Stack_Compute_Infrastructure_Nova_-d1e124">
-		<title>Open Stack Compute Infrastructure ( Nova )</title>
-		<para>Nova is the underlying cloud computing fabric controller for the OpenStack cloud. All activities needed to support the life cycle of instances within the OpenStack cloud are handled by Nova. It manages all the compute resources, networking, authorization, and scalability needs of the OpenStack cloud. Nova is a management platform and does not provide any virtualization capabilities by itself; instead, it uses libvirt APIs to interact with the supported hypervisors. Nova exposes its capabilities through a web services API that is compatible with that of EC2 of Amazon Web Services.</para>
+		<title>Open Stack Compute Infrastructure (Nova)</title>
+		<para>Nova is the Computing Fabric controller for the OpenStack Cloud. All activities needed to support the life cycle of instances within the OpenStack cloud are handled by Nova. This makes Nova a Management Platform that manages compute resources, networking, authorization, and scalability needs of the OpenStack cloud. But, Nova does not provide any virtualization capabilities by itself; instead, it uses libvirt API to interact with supported hypervisors. Nova exposes all its capabilities through a web services API that is compatible with the EC2 API of Amazon Web Services.</para>
     <section xml:id="Functions_and_Features-d1e132">
 		<title>Functions and Features:</title>
 		<itemizedlist>
@@ -39,49 +65,37 @@
 		<title>Components of OpenStack Compute</title>
 		<para>Nova Cloud Fabric is composed of the following major components:</para>
 		<itemizedlist>
-			<listitem><para>API Server ( nova-api )</para></listitem>
-			<listitem><para>Message Queue ( rabbit-mq server )</para></listitem>
-			<listitem><para>Compute Workers ( nova-compute )</para></listitem>
-			<listitem><para>Network Controller ( nova-network )</para></listitem>
-			<listitem><para>Volume Worker ( nova-volume )</para></listitem>
-			<listitem><para>Scheduler ( nova-scheduler )</para></listitem>
+			<listitem><para>API Server (nova-api)</para></listitem>
+			<listitem><para>Message Queue (rabbit-mq server)</para></listitem>
+			<listitem><para>Compute Workers (nova-compute)</para></listitem>
+			<listitem><para>Network Controller (nova-network)</para></listitem>
+			<listitem><para>Volume Worker (nova-volume)</para></listitem>
+			<listitem><para>Scheduler (nova-scheduler)</para></listitem>
 		</itemizedlist>
-<para>
-<mediaobject>
-		<imageobject role="fo">
-			<imagedata fileref="images/Arch.png"
-				format="PNG" scale="60"/>
-		</imageobject>
-		<imageobject role="html">
-			<imagedata fileref="images/Archhtml.png"
-				format="PNG" />
-		</imageobject>
-</mediaobject>
-</para>
 <section xml:id="API_Server_nova-api_-d1e213">
-		<title>API Server ( nova-api )</title>
-		<para>The API Server provides an interface to the outside world to interact with the cloud infrastructure. API server is the only component that the outside world uses to manage the infrastructure. The management is done through web services calls using EC2 API. The API Server then, in turn, communicates with the relevant components of the cloud infrastructure through the Message Queue. Also there is an OpenStack API as well now, as an alternative to the EC2 API.</para>
+		<title>API Server (nova-api)</title>
+		<para>The API Server provides an interface for the outside world to interact with the cloud infrastructure. API server is the only component that the outside world uses to manage the infrastructure. The management is done through web services calls using EC2 API. The API Server then, in turn, communicates with the relevant components of the cloud infrastructure through the Message Queue. As an alternative to EC2 API, OpenStack also provides a native API called "OpenStack API".</para>
 	</section>
     <section xml:id="Message_Queue_Rabbit_MQ_Server_-d1e223">
-		<title>Message Queue ( Rabbit MQ Server )</title>
-        <para>The OpenStack Cloud Controller communicates with other nova components such as the Scheduler, Network Controller, and Volume Controller via AMQP(Advanced Message Queue Protocol). Nova uses asynchronous calls for request response, with a call-back that gets triggered once a response is received. Since asynchronous communication is used, none of the end points get stuck for long in a waiting state. This is especially true since many actions expected by the API calls such as launching an instance or uploading an image are time consuming.</para>
+		<title>Message Queue (Rabbit MQ Server)</title>
+        <para>OpenStack communicates among themselves using the message queue via AMQP(Advanced Message Queue Protocol). Nova uses asynchronous calls for request response, with a call-back that gets triggered once a response is received. Since asynchronous communication is used, none of the user actions get stuck for long in a waiting state. This is effective since many actions expected by the API calls such as launching an instance or uploading an image are time consuming.</para>
     </section>
     <section xml:id="Compute_Worker_nova-compute_-d1e232">
-		<title>Compute Worker ( nova-compute )</title>
-		<para>Compute workers deal with instance management life cycle. they receive the requests for life cycle management via the Message Queue and carry out operations. There are several Compute Workers in a typical production cloud deployment. An instance is deployed on any of the available compute worker based on the scheduling algorithm used.</para>
+		<title>Compute Worker (nova-compute)</title>
+		<para>Compute workers deal with instance management life cycle. They receive the requests for instance life cycle management via the Message Queue and carry out operations. There are several compute workers in a typical production cloud deployment. An instance is deployed on any of the available compute worker based on the scheduling algorithm used.</para>
     </section>
     <section xml:id="Network_Controller_nova-network_-d1e241">
-		<title>Network Controller ( nova-network )</title>
+		<title>Network Controller (nova-network)</title>
 		<para>The Network Controller deals with the network configuration of host machines. It does operations like allocating IP addresses, configuring VLANs for projects, implementing security groups and configuring networks for compute nodes.</para>
     </section>
     <section xml:id="Volume_Workers_nova-volume_-d1e250">
-		<title>Volume Workers ( nova-volume )</title>
-		<para>Volume workers are used for the management of LVM-based instance volumes. Volume Workers perform volume related functions such as creation, deletion, attaching a volume to an instance, and detaching a volume from an instance. Volumes provide a way of providing persistent storage for use by instances, as the main disk attached to an instance is non-persistent and any changes made to it are lost when the volume is detached or the instance is terminated. When a volume is detached from an instance or when an instance, to which the volume is attached, is terminated, it retains the data that was stored on it when it was attached to an instance earlier. This data can be accessed by reattaching the volume to the same instance or by attaching it to another instances.</para>
-		<para>Any valuable data that gets accumulated during the life cycle of an instance should be written to a volume, so that it can be accessed later. This typically applies to the storage needs of database servers etc.</para>
+		<title>Volume Workers (nova-volume)</title>
+		<para>Volume workers are used for management of LVM-based instance volumes. Volume Workers perform volume related functions such as creation, deletion, attaching a volume to an instance, and detaching a volume from an instance. Volumes provide a way of providing persistent storage for the instances, as the root partition is non-persistent and any changes made to it are lost when an instance is terminated. When a volume is detached from an instance or when an instance, to which the volume is attached, is terminated, it retains the data that was stored on it. This data can be accessed by re-attaching the volume to the same instance or by attaching it to other instances.</para>
+		<para>Critical data in an instance must always be written to a volume, so that it can be accessed later. This typically applies to the storage needs of database servers etc.</para>
     </section>
     <section xml:id="Scheduler_nova-scheduler_-d1e262">
         <title>Scheduler (nova-scheduler)</title>
-        <para>The scheduler maps the nova-API calls to the appropriate openstack components. It runs as a daemon named nova-schedule and picks up a compute/network/volume server from a pool of available resources depending upon the scheduling algorithm in place. A scheduler can base its decisions on various factors such as load, memory, physical distance of the availability zone, CPU architecture, etc. The nova scheduler implements a pluggable architecture.</para>
+        <para>The scheduler maps the nova-API calls to the appropriate OpenStack components. It runs as a daemon named nova-schedule and picks up a compute server from a pool of available resources depending on the scheduling algorithm in place. A scheduler can base its decisions on various factors such as load, memory, physical distance of the availability zone, CPU architecture, etc. The nova scheduler implements a pluggable architecture.</para>
         <para>Currently the nova-scheduler implements a few basic scheduling algorithms:</para>
     <itemizedlist>
         <listitem><para>chance: In this method, a compute host is chosen randomly across availability zones.</para></listitem>
@@ -91,9 +105,35 @@
 </section>
 </section>
 </section>
+
+<section xml:id="OpenStack_Imaging_Service_Glance_-d1e329">
+    <title>OpenStack Imaging Service (Glance)</title>
+	<para>OpenStack Imaging Service is a lookup and retrieval system for virtual machine images. It can be configured to use any one of the following storage backends:</para>
+	<itemizedlist>
+		<listitem><para>Local filesystem  (default)</para></listitem>
+		<listitem><para>OpenStack Object Store to store images</para></listitem>
+		<listitem><para>S3 storage directly</para></listitem>
+		<listitem><para>S3 storage with Object Store as the intermediate for S3 access.</para></listitem>
+		<listitem><para>HTTP (read-only)</para></listitem>
+	</itemizedlist>
+    <section xml:id="Functions_and_Features_Glance_-d1e352">
+        <title>Functions and Features</title>
+    	<itemizedlist>
+    		<listitem><para>Provides imaging service</para></listitem>
+    	</itemizedlist>
+    </section>
+    <section xml:id="Components_of_OpenStack_Imaging_Service_Glance_-d1e365">
+		<title>Components of Glance</title>
+		<itemizedlist>
+			<listitem><para>Glance-control</para></listitem>
+			<listitem><para>Glance-registry</para></listitem>
+		</itemizedlist>
+    </section>
+</section>
+
 <section xml:id="OpenStack_Storage_Infrastructure_Swift_-d1e271">
 		<title>OpenStack Storage Infrastructure (Swift)</title>
-		<para>Swift provides a distributed, eventually consistent virtual object store for OpenStack. It is analogous to Amazon Web Services - Simple Storage Service (S3). Swift is capable of storing billions of objects distributed across nodes. Swift has built-in redundancy and failover management and is capable of archiving and media streaming. It is extremely scalable in terms of both size (Several petabytes) and capacity (Number of objects).</para>
+		<para>Swift provides a distributed, eventually consistent virtual object store for OpenStack. It is analogous to Amazon Web Services - Simple Storage Service (S3). Swift is capable of storing billions of objects distributed across nodes. Swift has built-in redundancy and failover management and is capable of archiving and media streaming. It is extremely scalable in terms of both size (several petabytes) and capacity (number of objects).</para>
 	<section xml:id="Functions_and_Features-d1e279">
 		<title>Functions and Features</title>
 		<itemizedlist>
@@ -101,7 +141,7 @@
 			<listitem><para>Storage of large sized objects</para></listitem>
 			<listitem><para>Data Redundancy</para></listitem>
 			<listitem><para>Archival capabilities - Work with large datasets</para></listitem>
-			<listitem><para>Data container for virtial machines and cloud apps</para></listitem>
+			<listitem><para>Data container for virtual machines and cloud apps</para></listitem>
 			<listitem><para>Media Streaming capabilities</para></listitem>
 			<listitem><para>Secure storage of objects</para></listitem>
 			<listitem><para>Backup and archival</para></listitem>
@@ -125,7 +165,7 @@
 	<para>The proxy server also handles failures of entities by rerouting requests to failover entities (handoff entities)</para>
 	</section>
 
-	<section xml:id="Swift_Object_Server-d1e291">
+<section xml:id="Swift_Object_Server-d1e291">
 	<title>Swift Object Server</title>
 	<para>The Object server is a blob store. It's responsibility is to handle storage, retrieval and deletion of objects stored in the local storage. Objects are typically binary files stored in the filesystem with metadata contained as extended file attributes (xattr).</para>
  
@@ -143,28 +183,58 @@
 	<title>The Ring</title>
 	<para>The ring contains information about the physical location of the objects stored inside Swift. It is a virtual representation of mapping of names of entities to their real physical location. It is analogous to an indexing service that various processes use to lookup and locate the real physical location of entities within the cluster. Entities like Accounts, Containers, Objects have their own seperate rings.</para>
 	</section>
-	</section>
-    <section xml:id="OpenStack_Imaging_Service_Glance_-d1e329">
-		<title>OpenStack Imaging Service ( Glance )</title>
-		<para>OpenStack Imaging Service is a lookup and retrieval system for virtual machine images. It can be configured to use any one of the following 3 storage backends:</para>
-		<itemizedlist>
-			<listitem><para>OpenStack Object Store to store images</para></listitem>
-			<listitem><para>S3 storage directly</para></listitem>
-			<listitem><para>S3 storage with Object Store as the intermediate for S3 access.</para></listitem>
-		</itemizedlist>
-        <section xml:id="Functions_and_Features_Glance_-d1e352">
-        <title>Functions and Features ( Glance )</title>
-		<itemizedlist>
-			<listitem><para>Provides imaging service</para></listitem>
-		</itemizedlist>
-    </section>
-    <section xml:id="Components_of_OpenStack_Imaging_Service_Glance_-d1e365">
-		<title>Components of OpenStack Imaging Service ( Glance )</title>
-		<itemizedlist>
-			<listitem><para>Glance-control</para></listitem>
-			<listitem><para>Glance-registry</para></listitem>
-		</itemizedlist>
-    </section>
-    </section>
-</section>
-</chapter>
\ No newline at end of file
+</section>
+
+<section xml:id="Openstack_Identity_server-d1e325">
+	<title>OpenStack Identity Service (Keystone)</title>
+    <para>Keystone provides identity and access policy services for all components in the OpenStack family. It implements it's own REST based API (Identity API). It provides authentication and authorization for all components of OpenStack including (but not limited to) Swift, Glance, Nova. Authentication verifies that a request actually comes from who it says it does. Authorization is verifying whether the authenticated user has access to the services he/she is requesting for.</para>
+<para>
+<mediaobject>
+		<imageobject role="fo">
+			<imagedata fileref="images/keystone.png"
+				format="PNG" scale="15"/>
+		</imageobject>
+		<imageobject role="html">
+			<imagedata fileref="images/keystonehtml.png"
+				format="PNG" />
+		</imageobject>
+</mediaobject>
+</para>
+    <para>Keystone provides two ways of authentication. One is username/password based and the other is token based. Apart from that, keystone provides the following services:</para>
+    <itemizedlist>
+        <listitem><para>Token Service (that carries authorization information about an authenticated user)</para></listitem>
+        <listitem><para>Catalog Service (that contains a list of available services at the users' disposal)</para></listitem>
+        <listitem><para>Policy Service (that let's keystone manage access to specific services by specific users or groups).</para></listitem>
+    </itemizedlist>
+	<section xml:id="OpenStack_Identity_server_components-d1e328">
+	<title>Components of Identity Service</title>
+	<itemizedlist>
+		<listitem><para>Endpoints - Every OpenStack service (Nova, Swift, Glance) runs on a dedicated port and on a dedicated URL(host), we call them endpoints.</para></listitem>
+		<listitem><para>Regions - A region defines a dedicated physical location inside a data centre. In a typical cloud setup, most if not all services are distributed across data centers/servers which are also called regions</para></listitem>
+		<listitem><para>User - A keystone authenticated user.</para></listitem>
+		<listitem><para>Services - Each component that is being connected to or being administered via keystone can be called a service. For example, we can call Glance a keystone service.</para></listitem>
+		<listitem><para>Role - In order to maintain restrictions as to what a particular user can do inside cloud infrastructure it is important to have a role associated.</para></listitem>
+		<listitem><para>Tenant - A tenant is a project with all the service endpoint and a role associated to user who is member of that particular tenant.</para></listitem>
+	</itemizedlist>
+	</section>	
+</section>
+
+<section xml:id="Openstack_Web_Interface-d1e340">
+	<title>Openstack Administrative Web-Interface (Horizon)</title>	
+    <para>Horizon the web based dashboard can be used to manage /administer OpenStack services. It can be used to manage instances and images, create keypairs, attach volumes to instances, manipulate Swift containers etc. Apart from this, dashboard even gives the user access to instance console and can connect to an instance through VNC. Overall, Horizon features the following:</para>
+    <itemizedlist>
+        <listitem><para>Instance Management - Create or terminate instance, view console logs and connect through VNC, Attaching volumes, etc.</para></listitem>
+        <listitem><para>Access and Security Management - Create security groups, manage keypairs, assign floating IPs, etc.</para></listitem>
+        <listitem><para>Flavor Management - Manage different flavors or instance virtual hardware templates.</para></listitem>
+        <listitem><para>Image Management - Edit or delete images.</para></listitem>
+        <listitem><para>View service catalog.</para></listitem>
+        <listitem><para>Manage users, quotas and usage for projects.</para></listitem>
+        <listitem><para>User Management - Create user, etc.</para></listitem>
+        <listitem><para>Volume Management - Creating Volumes and snapshots.</para></listitem>
+        <listitem><para>Object Store Manipulation - Create, delete containers and objects.</para></listitem>
+        <listitem><para>Downloading environment variables for a project.</para></listitem>
+    </itemizedlist>
+</section>
+
+</section>
+</chapter>

=== modified file 'Network.xml'
--- Network.xml	2011-10-19 14:27:25 +0000
+++ Network.xml	2012-05-09 21:52:21 +0000
@@ -3,15 +3,15 @@
 	<title>Network Management</title>
 	<section xml:id="Introduction-d1e2084">
 		<title>Introduction</title>
-		<para>In OpenStack, the networking is managed by a component called "nova-network". This interacts with nova-compute to ensure that the instances have the right kind of networking setup for them to communicate among themselves as well as with the outside world. Just as in Eucalyptus or AWS, each OpenStack instance can have 2 IP addresses attached to it. One is the private IP address and the other called Public IP address. The private IP address is typically used for communication between instances and the public IP is used for communication of instances with the outside world. The so called public IP address need not be a public IP address route-able on the Internet ; it can even be an address on the corporate LAN.</para>
-		<para>The network configuration inside the instance is done with the private IP address in view. The association between the private IP and the public IP and necessary routing is handled by nova-network and the instances need not be aware of it.</para>
+		<para>In OpenStack, the networking is managed by a component called "nova-network". This interacts with nova-compute to ensure that the instances have the right kind of networking setup for them to communicate among themselves as well as with the outside world. OpenStack instances can have 2 types of IP addresses associated to it: Private IP address (fixed) and Public IP address (floating). Private IP addresses are typically used for communication between instances (internal) and public IP addresses are used for communication of instances with the outside world (external or Internet). The so-called public IP addresses need not necessarily be IP addresses route-able on the Internet ; they can even be addresses on a corporate LAN.</para>
+		<para>The network configurations inside the instances are done with private IP addresses in view. The association between the private IP and the public IP addresses and necessary routing are handled by nova-network and the instances need not be aware of them.</para>
 		<para>nova-network provides 3 different network management options. Currently you can only choose one of these 3 options for your network management.</para>
 		<itemizedlist>
 			<listitem><para>Flat Network</para></listitem>
 			<listitem><para>Flat DHCP Network</para></listitem>
 			<listitem><para>VLAN Network</para></listitem>
 		</itemizedlist>
-		<para>VLAN Network is the most feature rich and is the idea choice for a production deployment, while the other modes can be used while getting familiar with OpenStack and when you do not have VLAN Enabled switches to connect different components of the OpenStack infrastructure.</para>
+		<para>VLAN Network is the most feature rich and is the ideal choice for a production deployment, while the other modes can be used while getting familiar with OpenStack and when you do not have VLAN Enabled switches to connect different components of the OpenStack infrastructure.</para>
 		<para>The network type is chosen by using one of the following configuration options in nova.conf file. If no network manager is specified explicitly, the default network manager, VLANManager is used.</para>
 		<programlisting>
 			--network_manager = nova.network.manager.FlatManager
@@ -20,17 +20,21 @@
 		</programlisting>
 		<para>In each of these cases, run the following commands to set up private and public IP addresses for use by the instances:</para>
 		<programlisting>
-			sudo nova-manage network create private 192.168.4.0/24 1 256
+			sudo nova-manage network create private --fixed_range_v4=192.168.4.3/27 --num_networks=1 --bridge=br100 --bridge_interface=eth1 --network_size=32
 			sudo nova-manage floating create --ip_range=10.10.10.224/27
 		</programlisting>
-		<para>The public IP which you are going to associate with an instance needs to be allocated first by using "euca-allocate-address" command:</para>
-		<programlisting>
-			euca-allocate-address 10.10.2.225
-		</programlisting>
-		<para>You can then associate a public IP to a running instance by using "euca-associate-address" command:</para>
-		<programlisting>
-			euca-associate-address -i i-0000008 10.10.2.225
-		</programlisting>
-		<para>Please refer to http://docs.openstack.org/openstack-compute/admin/content/ch04.html for more details about each of the networking types.</para>
+		<para>The public IP which you are going to associate with an instance needs to be allocated first by using the command:</para>
+		<programlisting>
+        nova floating-ip-create
+        +----------------+-------------+----------+------+
+        |       Ip       | Instance Id | Fixed Ip | Pool |
+        +----------------+-------------+----------+------+
+        | 10.10.10.225   | None        | None     | nova |
+        +----------------+-------------+----------+------+
+		</programlisting>
+		<para>You can then associate a public IP to a running instance by using the command:</para>
+		<programlisting>
+		nova add-floating-ip &lt;instance-name&gt; 10.10.2.225
+		</programlisting>
 	</section>
 </chapter>

=== modified file 'Openstackbook.xml'
--- Openstackbook.xml	2011-10-19 14:27:25 +0000
+++ Openstackbook.xml	2012-05-09 21:52:21 +0000
@@ -3,9 +3,8 @@
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:svg="http://www.w3.org/2000/svg"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  version="5.0"
-  >
+  xmlns:html="http://www.w3.org/1999/xhtml" version="5.0"
+  xml:id="book_ygy_znp_2g">
   <title>OpenStack Compute Starter Guide</title>
   <info>
     <author>
@@ -18,29 +17,33 @@
       </affiliation>
     </author>
     <copyright>
-      <year>2011</year>
-      <holder>CSS Corp Private Limited ( http://www.csscorp.com/ )</holder>
+      <year>2012</year>
+      <holder>CSS Corp Private Limited
+        (http://www.csscorp.com/)</holder>
     </copyright>
-    <releaseinfo>diablo</releaseinfo>
+    <releaseinfo>essex</releaseinfo>
     <productname>OpenStack Compute</productname>
-    <pubdate>2011-10-19</pubdate>
+    <pubdate>2012-05-04</pubdate>
     <legalnotice role="cc-by-nc-sa">
       <annotation>
-        <remark>Remaining licensing details are filled in by the template.</remark>
+        <remark>Rest of the licensing details are filled in by the
+          template.</remark>
       </annotation>
     </legalnotice>
     <abstract>
-      <para>This is a tutorial style beginner's guide for OpenStack™ on Ubuntu 11.10, Oneiric Ocelot.
-        The aim is to help the reader in setting up a minimal installation of OpenStack. </para>
+      <para>This is a tutorial style beginner's guide for OpenStack™
+        on Ubuntu 12.04, Precise Pangolin. The aim is to help the
+        reader in setting up a minimal installation of OpenStack.
+      </para>
     </abstract>
   </info>
-<xi:include href="Introduction.xml" />
-<xi:include href="Installation.xml"/>
-<xi:include href="Image.xml"/>
-<xi:include href="Instance.xml"/>
-<xi:include href="Storage.xml"/>
-<xi:include href="Network.xml"/>
-<xi:include href="Security.xml"/>
-<xi:include href="Commands.xml"/>
-
+  <xi:include href="Introduction.xml"/>
+  <xi:include href="Installation.xml"/>
+  <xi:include href="Image.xml"/>
+  <xi:include href="Instance.xml"/>
+  <xi:include href="Dashboard.xml"/>
+  <xi:include href="Storage.xml"/>
+  <xi:include href="Network.xml"/>
+  <xi:include href="Security.xml"/>
+  <xi:include href="Commands.xml"/>
 </book>

=== modified file 'README'
--- README	2011-09-27 13:32:13 +0000
+++ README	2012-05-09 21:52:21 +0000
@@ -1,9 +1,9 @@
-OpenStack Beginner's Guide for Ubuntu 11.10, Oneiric Ocelot
-===========================================================
-
-Copy Right: CSS Corp Private Limited ( http://www.csscorp.com/ ), 2011
-
-This is a tutorial style Beginner's guide for OpenStack on Ubuntu 11.04. 
+OpenStack Beginner's Guide for Ubuntu 12.04, Precise Pangolin
+=============================================================
+
+Copy Right: CSS Corp Private Limited ( http://www.csscorp.com/ ), 2012
+
+This is a tutorial style Beginner's guide for OpenStack on Ubuntu 12.04. 
 The aim is to help the reader in setting up a minimal installation of OpenStack.
 The content is released under Creative Commons - Share Alike Attribution License.
 

=== modified file 'Security.xml'
--- Security.xml	2011-10-19 14:27:25 +0000
+++ Security.xml	2012-05-09 21:52:21 +0000
@@ -2,51 +2,55 @@
 <title>Security</title>
 <section xml:id="Security_Overview-d1e2505">
 <title>Security Overview</title>
-<para>OpenStack provides ingress filtering for the instances based on the concept of security groups. OpenStack accomplishes ingress filtering by creating suitable IP Tables rules. A Security Group is a named set of rules that get applied to the incoming packets for the instances. You can specify a security group while launching an instance. Each security group can have multiple rules associated with it. Each rule specifies the source IP/network, protocol type, destination ports etc. Any packet matching these parameters specified in a rule is allowed in. Rest of the packets are blocked.</para>
-<para>A security group that does not have any rules associated with it causes blocking of all incoming traffic. The mechanism only provides ingress filtering and does not provide any egress filtering. As a result all outbound traffic is allowed. If you need to implement egress filtering, you will need to implement that inside the instance using a firewall.</para>
-<para>Tools like Hybridfox let you manage security groups and also let you specify a security group while launching an instance. You can also use command line tools from euca2ools package such as euca-authorize for this purpose.</para>
-<para>Here are a few euca commands to manage security groups. Like in our earlier chapters, the project name is "proj"</para>
+<para>OpenStack provides ingress filtering for the instances based on the concept of security groups. OpenStack accomplishes ingress filtering by creating suitable iptables rules. A Security Group is a named set of rules that get applied to the incoming packets for the instances. You can specify a security group while launching an instance. Each security group can have multiple rules associated with it. Each rule specifies the source IP/network, protocol type, destination ports etc. Any packet matching these parameters specified in a rule is allowed in. Rest of the packets are blocked.</para>
+<para>A security group that does not have any rules associated with it causes blocking of all incoming traffic. The mechanism only provides ingress filtering and does not provide any egress filtering. As a result all outbound traffic is allowed. If you need to implement egress filtering, you will need to implement that inside the instance (during bundling process) using a firewall.</para>
+<para>The OpenStack Dashboard lets you manage security groups and also let you specify a security group while launching an instance. You can also use commands like 'nova secgroup-add-rule' etc. for this purpose.</para>
+<para>Here are a few nova commands to manage security groups.</para>
 
 <para>Create a security group named "myservers".</para>
 <programlisting> 
-euca-add-group -d "My Servers" myservers
+nova secgroup-create &lt;name&gt; &lt;description&gt;
+nova secgroup-create myservers my-default-server-group
 </programlisting>
 
 <para>Add a rule to the security group "myservers" allowing icmp and tcp traffic from 192.168.1.1.</para>
 <programlisting>
-euca-authorize -P tcp -s 192.168.1.1 -p 22 myservers
-euca-authorize -P icmp -s 192.168.1.1 -t -1:-1 myservers
+nova secgroup-add-rule myservers tcp 22 22 192.168.1.1/0
+nova secgroup-add-rule myservers icmp -1 -1 192.168.1.1/0
 </programlisting>
 
 <para>For a Windows instance, add a rule to accept incoming RDP connections</para>
 <programlisting>
-euca-authorize -P tcp -s 192.168.1.1 -p 3389 myservers
+nova secgroup-add-rule myservers tcp 3389 3389 192.168.1.1/0
 </programlisting>
 
-<para>Rules can be viewed with euca-describe-groups command.</para>
+<para>Rules can be viewed with the command.</para>
 <programlisting>
-$ euca-describe-groups
-GROUP    proj   myservers    my servers
-PERMISSION    proj    myservers    ALLOWS    tcp    22    22    FROM    CIDR 192.168.1.1
-PERMISSION    proj   myservers    ALLOWS    icmp    -1    -1    FROM    CIDR   192.168.1.1
-PERMISSION    proj    myservers    ALLOWS    tcp    3389   3389    FROM    CIDR 192.168.1.1
+$ nova secgroup-list-rules myservers
++-------------+-----------+---------+--------------+--------------+
+| IP Protocol | From Port | To Port |  IP Range    | Source Group |
++-------------+-----------+---------+--------------+--------------+
+|             |           |         |              |              | 
+| icmp        | -1        | -1      |192.168.1.1/0 |  myservers   |
+| tcp         | 22        | 22      |192.168.1.1/0 |  myservers   |
++-------------+-----------+---------+--------------+--------------+
 </programlisting>
 
 <para>Remove the rule for ssh traffic from the source ip 192.168.1.1 from the security group "myservers"</para>
 <programlisting>
-euca-revoke -P tcp -s 192.168.1.1 -p 22 myservers
+nova secgroup-delete-rule myservers ssh 22 22 192.168.1.1
 </programlisting>
 
 <para>Delete the security group "myservers"</para>
 <programlisting>
-euca-delete-group myservers
+nova secgroup-delete myservers
 </programlisting>
 
 <para>Launch an instance associated with the security group "myservers".</para>
 <programlisting>
-euca-run-instances ami-XXXXXXXX -k mykey -g myservers
+nova boot --flavor 1 --image 9bab7ce7-7523-4d37-831f-c18fbc5cb543 --key_name mykey myinstance --security_groups myservers
 </programlisting>
 
-<para>When you do not specify a security group, the instance gets associated with an inbuilt security group called "default". The rules for this security group can also be modified using euca-add, euca-revoke commands.</para>
+<para>When you do not specify a security group, the instance gets associated with an inbuilt security group called "default". The rules for this security group can also be modified using nova secgroup-add-rule , nova secgroup-delete-rule commands.</para>
 </section>
-</chapter>
\ No newline at end of file
+</chapter>

=== modified file 'Storage.xml'
--- Storage.xml	2011-10-19 14:27:25 +0000
+++ Storage.xml	2012-05-09 21:52:21 +0000
@@ -1,91 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?><chapter xmlns:db="http://docbook.org/ns/docbook" xmlns="http://docbook.org/ns/docbook" xml:id="Storage_Management-d1e1995" version="5.0" xml:base="Storage.xml">
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter xmlns:db="http://docbook.org/ns/docbook" xmlns="http://docbook.org/ns/docbook" xml:id="Storage_Management-chapter" version="5.0" xml:base="Storage.xml">
  <title>Storage Management</title>
 <section xml:id="Nova-volume-d1e2000">
 <title>Nova-volume</title>
-<para>Nova-volume provides persistent block storage compatible with Amazon's Elastic Block Store. The storage on the instances is non persistent in nature and hence any data that you generate and store on the file system on the first disk of the instance gets lost when the instance is terminated. You will need to use persistent volumes provided by nova-volume if you want any data generated during the life of the instance to persist after the instance is terminated.</para>
-<para>Commands from euca2ools package can be used to manage these volumes.</para>
+<para>Nova-volume provides persistent block storage compatible with Amazon's Elastic Block Store. The storage on the instances is non-persistent by nature and hence any data that are generated and stored on the file system on the first disk of the instance are lost when the instance is terminated. You will need to use persistent volumes provided by nova-volume if you want any data generated during the life of the instance to persist after the instance is terminated.</para>
+<para>Nova commands can be used to manage these volumes.</para>
 <para>Here are a few examples:</para>
 <section xml:id="Interacting_with_Storage_Controller-d1e2014">
 <title>Interacting with Storage Controller</title>
 <para>Make sure that you have sourced novarc before running any of the following commands. The following commands refer to a zone called 'nova', which we created in the chapter on "Installation and Configuration". The project is 'proj' as referred to in the other chapters.</para>
 <para>Create a 10 GB volume</para>
-<programlisting>euca-create-volume -s 10 -z nova</programlisting>
-<para>You should see an output like:</para>
-<programlisting>VOLUME    vol-00000002    1    creating (proj, None, None, None)    2011-04-21T07:19:52Z</programlisting>
+<programlisting>nova volume-create --display_name myvolume 10</programlisting>
 <para>List the volumes</para>
-<programlisting>euca-describe-volumes</programlisting>
+<programlisting>nova volume-list</programlisting>
 <para>You should see an output like this:</para>
-<programlisting>VOLUME    vol-00000001     1        nova    available (proj, server1, None, None)    2011-04-21T05:11:22Z</programlisting>
-<programlisting>VOLUME    vol-00000002     1        nova    available (proj, server1, None, None)    2011-04-21T07:19:52Z</programlisting>
+<programlisting>
++----+-----------+--------------+------+-------------+--------------------------------------+
+| ID |   Status  | Display Name | Size | Volume Type |             Attached to              |
++----+-----------+--------------+------+-------------+--------------------------------------+
+| 1  | in-use    | New Volume   | 20   | None        | 7db4cb64-7f8f-42e3-9f58-e59c9a31827d |
+| 4  | available | volume1      | 10   | None        |                                      |
+| 5  | available | myvolume     | 10   | None        |                                      |
+| 6  | available | myvolume1    | 10   | None        |                                      |
++----+-----------+--------------+------+-------------+--------------------------------------+
+</programlisting>
 <para>Attach a volume to a running instance</para>
-<programlisting>euca-attach-volume -i i-00000009 -d /dev/vdb vol-00000002</programlisting>
-<para>A volume can only be attached to one instance at a time. When euca-describe-volumes shows the status of a volume as 'available', it means it is not attached to any instance and ready to be used. If you run euca-describe-volumes, you can see that the status changes from "available" to "in-use" if it is attached to an  instance successfully.</para>
-<para>When a volume is attached to an instance, it shows up as an additional SCSI disk on the instance. You can login to the instance and mount the disk, format it and use it.</para>
+<programlisting>nova volume-attach 857d70e4-35d5-4bf6-97ed-bf4e9a4dcf5a &lt;volume-id&gt; /dev/vdb</programlisting>
+<para>A volume can only be attached to one instance at a time. When nova volume-list shows the status of a volume as 'available', it means it is not attached to any instance and ready to be used. If you run nova volume-list, you can see that the status changes from "available" to "in-use" if it is attached to an  instance successfully.</para>
+<para>When a volume is attached to an instance, it shows up as an additional disk on the instance. You can login to the instance and mount the disk, format it and use it.</para>
 <para>Detach a volume from an instance.</para>
-<programlisting>euca-detach-volume vol-00000002</programlisting>
-<para>The data on the volume persists even after the volume is detached from an instance. You can see the data on reattaching the volume to another instance.</para>
+<programlisting>nova volume-detach 857d70e4-35d5-4bf6-97ed-bf4e9a4dcf5a &lt;volume-id&gt;</programlisting>
+<para>The data on the volume persists even after the volume is detached from an instance or after the instance is terminated. You can view the data after attaching the volume to another instance.</para>
 <para>Even though you have indicated /dev/vdb as the device on the instance, the actual device name created by the OS running inside the instance may differ. You can find the name of the device by looking at the device nodes in /dev or by watching the syslog when the volume is being attached.</para>
 </section>
-<section>
+<section xml:id="Swift_storage_operations--d1e2125">
 <title>Swift</title>
-<para>Swift is a storage service that can be used for storage and archival of objects. Swift provides a REST interface. You can use 'curl' command to get familiar with the service. All requests to Swift service need an authentication token. This authentication token can be obtained by providing your user credentials on Swift. For more details refer to the Swift section in the "Installation &amp; Configuration" chapter.</para>
-<para>Execute the following command and make a note of X-Auth-Token. You will need this token to use in all subsequent commands.</para>
-<programlisting>
-curl -v -H 'X-Storage-User: admin:admin' -H 'X-Storage-Pass: admin' http://10.10.10.2:8080/auth/v1.0
-</programlisting>
-<para>In the following command examples we are using 'AUTH_tk3bb59eda987446c79160202d4dfbdc8c' as the X-Auth-Token. Replace this with the appropriate token you obtained in the above step.</para>
-<para>To create a container:</para>
-<programlisting>
-curl -X PUT -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer
-</programlisting>
-<para>To list all containers in current account:</para>
-<programlisting>
-curl -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/
-</programlisting>
-<para>Uploading a file "file1" to container "mycontainer"</para>
-<programlisting>
-curl -X PUT -T file1 -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer/
-</programlisting>
-<para>To list all objects in a container:</para>
-<programlisting>
-curl -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer
-</programlisting>
-<para>To list all objects in a container that starts with a particular prefix "fi":</para>
-<programlisting>
-curl -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer/?prefix=fi 
-</programlisting>
-<para>To download a particular file "file1" from the container "mycontainer":</para>
-<programlisting>
-curl -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer/file1
-</programlisting>
-<para>To download file1 and save it locally as localfile1:</para>
-<programlisting>
-curl -o localfile1 -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer/file1
-</programlisting>
-<para>To delete a container "mycontainer"</para>
-<programlisting>
-curl -X DELETE -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer
-</programlisting>
-<para>To delete a specific file "file1" from the container:</para>
-<programlisting>
-curl -X DELETE -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer/file1
-</programlisting>
-<para>To get metadata associated with a Swift account:</para>
-<programlisting>
-curl -v -X HEAD -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/
-</programlisting>
-<para>To get metadata associated with a container:</para>
-<programlisting>
-curl -v -X HEAD -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer
-</programlisting>
-<para>You can request the data from Swift in XML or JSON format by specifying the "format" paramater. This parameter can be applied to any of the above requests. Here are a few examples:</para>
-<programlisting>
-curl -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/?format=json
-</programlisting>
-<programlisting>
-curl -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/?format=xml
-</programlisting>
-<para>The above operations can also be done using 'swift' command. For instructions on using 'swift' command, please refer to "swift --help".</para>
-</section>
-</section>
-</chapter>
\ No newline at end of file
+<para>Swift is a reliable, distributed, massively scalable blob storage service that can be used for storage and archival of objects. Swift provides a REST interface. You can use Swift commandline which is an interface for the OpenStack object store service.</para>
+<para>To get the information about swift account, container and objects.</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd stat
+Account: AUTH_43b42dae-dc0b-4a4b-ac55-97de614d6e6e
+Containers: 1
+Objects: 1
+Bytes: 1124
+Accept-Ranges: bytes
+X-Trans-Id: txb21186a9eef64ed295a1e95896a0fc72
+</programlisting>
+<para>To get information about a particular container (mycontainer):</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd stat mycontainer
+</programlisting>
+<para>To get information about an object (abc123.txt) within container (mycontainer):</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd stat mycontainer abc123.txt
+</programlisting>
+<para>To list available containers in account:</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd list
+</programlisting>
+<para>To list all containers whose names begin with 'my':</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd --prefix=my list
+</programlisting>
+<para>To list all objects within container 'mycontainer':</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd --prefix=my list mycontainer
+</programlisting>
+<para>To upload files 'abc.txt' and 'xyz.txt' to 'mycontainer':</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd upload mycontainer /path/abc.txt /path/xyz.txt
+</programlisting>
+<para>To download all the objects from all containers:</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd --all download
+</programlisting>
+<para>To download all objects from container 'mycontainer':</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd download mycontainer
+</programlisting>
+<para>To download 'abc.txt' and 'xyz.txt' from container 'mycontainer':</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd download mycontainer abc.txt xyz.txt
+</programlisting>
+<para>To delete all objects in all containers:</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd --all delete
+</programlisting>
+<para>To delete all objects in container 'mycontainer':</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd delete mycontainer
+</programlisting>
+<para>To delete files 'abc.txt' and 'xyz.txt' from container 'mycontainer':</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd delete mycontainer abc.txt xyz.txt
+</programlisting>
+</section>
+</section>
+</chapter>

=== removed file 'images/Arch.png'
Binary files images/Arch.png	2011-10-11 13:49:47 +0000 and images/Arch.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/Archhtml.png'
Binary files images/Archhtml.png	2011-10-11 13:49:47 +0000 and images/Archhtml.png	1970-01-01 00:00:00 +0000 differ
=== added file 'images/architecture.png'
Binary files images/architecture.png	1970-01-01 00:00:00 +0000 and images/architecture.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/architecturehtml.png'
Binary files images/architecturehtml.png	1970-01-01 00:00:00 +0000 and images/architecturehtml.png	2012-05-09 21:52:21 +0000 differ
=== removed file 'images/ckeypairs.png'
Binary files images/ckeypairs.png	2011-09-16 11:05:01 +0000 and images/ckeypairs.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/coutput.png'
Binary files images/coutput.png	2011-09-16 11:05:01 +0000 and images/coutput.png	1970-01-01 00:00:00 +0000 differ
=== added directory 'images/dashboard'
=== added file 'images/dashboard/access_security.png'
Binary files images/dashboard/access_security.png	1970-01-01 00:00:00 +0000 and images/dashboard/access_security.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/access_security_securitygp.png'
Binary files images/dashboard/access_security_securitygp.png	1970-01-01 00:00:00 +0000 and images/dashboard/access_security_securitygp.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/containers.png'
Binary files images/dashboard/containers.png	1970-01-01 00:00:00 +0000 and images/dashboard/containers.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/create_keypair.png'
Binary files images/dashboard/create_keypair.png	1970-01-01 00:00:00 +0000 and images/dashboard/create_keypair.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/edit_security_securitygp.png'
Binary files images/dashboard/edit_security_securitygp.png	1970-01-01 00:00:00 +0000 and images/dashboard/edit_security_securitygp.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/flavors.png'
Binary files images/dashboard/flavors.png	1970-01-01 00:00:00 +0000 and images/dashboard/flavors.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/images.png'
Binary files images/dashboard/images.png	1970-01-01 00:00:00 +0000 and images/dashboard/images.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/images_snapshots.png'
Binary files images/dashboard/images_snapshots.png	1970-01-01 00:00:00 +0000 and images/dashboard/images_snapshots.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/instances.png'
Binary files images/dashboard/instances.png	1970-01-01 00:00:00 +0000 and images/dashboard/instances.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/instances_volumes.png'
Binary files images/dashboard/instances_volumes.png	1970-01-01 00:00:00 +0000 and images/dashboard/instances_volumes.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/login.png'
Binary files images/dashboard/login.png	1970-01-01 00:00:00 +0000 and images/dashboard/login.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/objects.png'
Binary files images/dashboard/objects.png	1970-01-01 00:00:00 +0000 and images/dashboard/objects.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/overview.png'
Binary files images/dashboard/overview.png	1970-01-01 00:00:00 +0000 and images/dashboard/overview.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/overview2.png'
Binary files images/dashboard/overview2.png	1970-01-01 00:00:00 +0000 and images/dashboard/overview2.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/projects.png'
Binary files images/dashboard/projects.png	1970-01-01 00:00:00 +0000 and images/dashboard/projects.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/quotas.png'
Binary files images/dashboard/quotas.png	1970-01-01 00:00:00 +0000 and images/dashboard/quotas.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/services.png'
Binary files images/dashboard/services.png	1970-01-01 00:00:00 +0000 and images/dashboard/services.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/users.png'
Binary files images/dashboard/users.png	1970-01-01 00:00:00 +0000 and images/dashboard/users.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/vnc1.png'
Binary files images/dashboard/vnc1.png	1970-01-01 00:00:00 +0000 and images/dashboard/vnc1.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/vnc2.png'
Binary files images/dashboard/vnc2.png	1970-01-01 00:00:00 +0000 and images/dashboard/vnc2.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/keystone.png'
Binary files images/keystone.png	1970-01-01 00:00:00 +0000 and images/keystone.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/keystone_dashboard.png'
Binary files images/keystone_dashboard.png	1970-01-01 00:00:00 +0000 and images/keystone_dashboard.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/keystone_dashboardhtml.png'
Binary files images/keystone_dashboardhtml.png	1970-01-01 00:00:00 +0000 and images/keystone_dashboardhtml.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/keystonehtml.png'
Binary files images/keystonehtml.png	1970-01-01 00:00:00 +0000 and images/keystonehtml.png	2012-05-09 21:52:21 +0000 differ
=== modified file 'images/lifecycle.png'
Binary files images/lifecycle.png	2011-09-16 11:05:01 +0000 and images/lifecycle.png	2012-05-09 21:52:21 +0000 differ
=== modified file 'images/lifecyclehtml.png'
Binary files images/lifecyclehtml.png	2011-09-16 11:05:01 +0000 and images/lifecyclehtml.png	2012-05-09 21:52:21 +0000 differ
=== removed file 'images/linstance.png'
Binary files images/linstance.png	2011-09-16 11:05:01 +0000 and images/linstance.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/openstackv5.png'
Binary files images/openstackv5.png	2011-10-19 14:27:25 +0000 and images/openstackv5.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/openstackv5html.png'
Binary files images/openstackv5html.png	2011-10-19 14:27:25 +0000 and images/openstackv5html.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/security1.png'
Binary files images/security1.png	2011-09-16 11:05:01 +0000 and images/security1.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/security1html.png'
Binary files images/security1html.png	2011-09-16 11:05:01 +0000 and images/security1html.png	1970-01-01 00:00:00 +0000 differ
=== added file 'images/setup.png'
Binary files images/setup.png	1970-01-01 00:00:00 +0000 and images/setup.png	2012-05-09 21:52:21 +0000 differ
=== added file 'images/setuphtml.png'
Binary files images/setuphtml.png	1970-01-01 00:00:00 +0000 and images/setuphtml.png	2012-05-09 21:52:21 +0000 differ
=== removed file 'images/tinstance.png'
Binary files images/tinstance.png	2011-09-16 11:05:01 +0000 and images/tinstance.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'pom.xml'
--- pom.xml	2011-10-20 14:44:13 +0000
+++ pom.xml	2012-05-09 21:52:21 +0000
@@ -46,100 +46,126 @@
             </resource>
         </resources>
         <plugins>
-            <!--<plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>batik-maven-plugin</artifactId>
-                <version>1.0-beta-1</version>
-                
-                <executions>
-                <execution>
-                <goals>
-                <goal>rasterize</goal>
-                </goals>
-                <phase>generate-sources</phase>
-                <configuration>
-                <srcDir>${basedir}/source/docbkx/openstack-api-extensions/figures</srcDir>
-                <destDir>${basedir}/target/docbkx/webhelp/apix-intro-proposal/content/figures</destDir>
-                </configuration>
-                </execution>
-                </executions>
-                </plugin>-->
+
             <plugin>
                 <groupId>com.rackspace.cloud.api</groupId>
                 <artifactId>clouddocs-maven-plugin</artifactId>
-                <version>1.0.4</version>
+                <version>1.2.0</version>
                 <executions>
                     <execution>
+                        <id>goal1</id>
                         <goals>
                             <goal>generate-pdf</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <highlightSource>false</highlightSource>
+                            <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
+                            <sectionAutolabel>0</sectionAutolabel>
+                            <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>goal2</id>
+                        <goals>
                             <goal>generate-webhelp</goal>
                         </goals>
                         <phase>generate-sources</phase>
+                        <configuration>
+                            <!-- These parameters only apply to webhelp -->
+                            <enableDisqus>1</enableDisqus>
+                            <disqusShortname>openstackstarterdoc</disqusShortname>
+                            <enableGoogleAnalytics>1</enableGoogleAnalytics>
+                            <googleAnalyticsId>UA-17511903-6</googleAnalyticsId>
+                            <generateToc>
+                                appendix  toc,title
+                                article/appendix  nop
+                                article   toc,title
+                                book      title,figure,table,example,equation
+                                chapter   toc,title
+                                part      toc,title
+                                preface   toc,title
+                                qandadiv  toc
+                                qandaset  toc
+                                reference toc,title
+                                set       toc,title
+                            </generateToc>
+                            <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
+                            <sectionAutolabel>0</sectionAutolabel>
+                            <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
+                            <postProcess>
+                                <!-- Copies the figures to the correct location for webhelp -->
+                                
+                                <copy todir="${basedir}/target/docbkx/webhelp/OpenStackbook/content/images">
+                                    <fileset dir="${basedir}/images">
+                                        <include name="**/*.*" />
+                                    </fileset>
+                                </copy>
+                                
+                                <!-- Copies webhelp (HTML output) to desired URL location on docs.openstack.org -->
+                                
+                                <copy
+                                    todir="${basedir}/target/docbkx/webhelp/openstack-compute/starter">
+                                    <fileset
+                                        dir="${basedir}/target/docbkx/webhelp/Openstackbook/">
+                                        <include name="**/*" />
+                                    </fileset>
+                                </copy>
+                                
+                                <!--Moves PDFs to the needed placement -->
+                                
+                                <move failonerror="false"
+                                    file="${basedir}/target/docbkx/pdf/Openstackbook.pdf"
+                                    tofile="${basedir}/target/docbkx/webhelp/openstack-compute/starter/os-compute-starterguide-trunk.pdf"/>                
+                                
+                                <!--Deletes leftover uneeded directories -->
+                                
+                                <delete dir="${basedir}/target/docbkx/webhelp/Openstackbook"/>
+                                
+                            </postProcess>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>goal3</id>
+                        <goals>
+                            <goal>generate-epub</goal>
+                        </goals>
+                        <!--<phase>generate-sources</phase>-->
+                        <configuration>
+                            <highlightSource>true</highlightSource>
+                            <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
+                            <sectionAutolabel>0</sectionAutolabel>
+                            <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
+                            <postProcess>
+                                <!-- Copies the figures to the correct location for epub -->
+                                <mkdir dir="${basedir}/target/docbkx/epub/Openstackbook/images"/>
+                                <copy todir="${basedir}/target/docbkx/epub/Openstackbook/images">
+                                    <fileset dir="${basedir}/images">
+                                        <include name="**/*.png" />
+                                    </fileset>
+                                </copy>
+                               
+                                <!-- Rezip now that the figures are in the correct location -->
+                                <zip
+                                    destfile="${basedir}/target/docbkx/webhelp/openstack-compute/starter/os-compute-starterguide.epub"
+                                    basedir="${basedir}/target/docbkx/epub/Openstackbook/"
+                                    update="true"
+                                    excludes="**/*.epub"/>
+                                
+                            </postProcess>
+                        </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.docbook</groupId>
-                        <artifactId>docbook-xml</artifactId>
-                        <version>4.4</version>
-                        <scope>runtime</scope>
-                    </dependency>
-                </dependencies>
                 <configuration>
+                    <!-- These parameters apply to all the goals -->
                     <xincludeSupported>true</xincludeSupported>
                     <sourceDirectory>.</sourceDirectory>
                     <includes>
                         Openstackbook.xml
                     </includes>
-                    <highlightSource>false</highlightSource>
                     <profileSecurity>reviewer</profileSecurity>
                     <branding>openstack</branding>
-                    <enableDisqus>1</enableDisqus>
-                    <disqusShortname>openstackstarterdoc</disqusShortname>
-                    <enableGoogleAnalytics>1</enableGoogleAnalytics>
-                    <googleAnalyticsId>UA-17511903-6</googleAnalyticsId>
-                    <generateToc>
-                        appendix  toc,title
-                        article/appendix  nop
-                        article   toc,title
-                        book      title,figure,table,example,equation
-                        chapter   toc,title
-                        part      toc,title
-                        preface   toc,title
-                        qandadiv  toc
-                        qandaset  toc
-                        reference toc,title
-                        set       toc,title
-                    </generateToc>
-                    <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
-                    <sectionAutolabel>0</sectionAutolabel>
-                    <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
-                    <postProcess>
-                        <!-- Copies the figures to the correct location for webhelp -->
-                        <copy todir="${basedir}/target/docbkx/webhelp/Openstackbook/content/images">
-                            <fileset dir="${basedir}/images">
-                                <include name="**/*.png"/>
-                            </fileset>
-                        </copy>
-                        
-                        <!-- Moves HTML of Starter Guide to diablo directory -->
-                        <copy todir="${basedir}/target/docbkx/webhelp/diablo/openstack-compute/starter/">
-                            <fileset
-                                dir="${basedir}/target/docbkx/webhelp/Openstackbook">
-                                <include name="**/*" />
-                            </fileset>
-                        </copy>
-                        
-                        <!--Moves PDFs to the needed placement -->
-                        <move failonerror="false"
-                            file="${basedir}/target/docbkx/pdf/Openstackbook.pdf"
-                            tofile="${basedir}/target/docbkx/webhelp/diablo/openstack-compute/starter/openstack-starter-guide-diablo.pdf"/>
-                        <!--Deletes leftover uneeded directories -->
-                        <!--<delete
-                            dir="${basedir}/target/docbkx/pdf"/>-->
-                    </postProcess>
                 </configuration>
-                
             </plugin>
             
         </plugins>

=== removed directory 'target'
=== removed directory 'target/docbkx'
=== removed directory 'target/docbkx/fonts'
=== removed directory 'target/docbkx/fonts/CartoGothic-Std'
=== removed file 'target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Bold.ttf'
Binary files target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Bold.ttf	2011-09-16 11:05:01 +0000 and target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Bold.ttf	1970-01-01 00:00:00 +0000 differ
=== removed file 'target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-BoldItalic.ttf'
Binary files target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-BoldItalic.ttf	2011-09-16 11:05:01 +0000 and target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-BoldItalic.ttf	1970-01-01 00:00:00 +0000 differ
=== removed file 'target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Book.ttf'
Binary files target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Book.ttf	2011-09-16 11:05:01 +0000 and target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Book.ttf	1970-01-01 00:00:00 +0000 differ
=== removed file 'target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Italic.ttf'
Binary files target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Italic.ttf	2011-09-16 11:05:01 +0000 and target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Italic.ttf	1970-01-01 00:00:00 +0000 differ
=== removed file 'target/docbkx/fonts/CartoGothic-Std/FontSite License.txt'
--- target/docbkx/fonts/CartoGothic-Std/FontSite License.txt	2011-09-16 11:05:01 +0000
+++ target/docbkx/fonts/CartoGothic-Std/FontSite License.txt	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-This typeface software ("SOFTWARE") is the property of FontSite Inc. Its
-use by you is covered under the terms of an End-User License Agreement
-("EULA"). By exercising your rights to make and use copies of this SOFTWARE,
-you agree to be bound by the terms of this EULA. If you do not agree to the
-terms of this EULA, you may not use the SOFTWARE.
-
-This SOFTWARE is a valuable asset of FontSite Inc. which is protected by
-copyright laws and international copyright treaties, as well as other
-intellectual property laws and treaties. The typeface software is licensed,
-not sold.
-
-This EULA grants you the following rights:
-
-You may install and use an unlimited number of copies of this SOFTWARE.
-
-You may reproduce and distribute an unlimited number of copies of this
-SOFTWARE, provided that each copy shall be a true and complete copy,
-including all copyright and trademark notices, electronic documentation
-(user guide in PDF format, etc.), and shall be accompanied by a copy of this
-EULA. Copies of the SOFTWARE may not be distributed for profit either on a
-standalone basis or included as part of your own product.
\ No newline at end of file

=== removed file 'target/docbkx/fonts/fontconfig.st'
--- target/docbkx/fonts/fontconfig.st	2011-09-16 11:05:01 +0000
+++ target/docbkx/fonts/fontconfig.st	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fop version="1.0">
-    <!-- Base URL for resolving relative URLs -->
-    <base>.</base>
-
-    <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
-    <source-resolution>90</source-resolution>
-    <!-- Target resolution in dpi (dots/pixels per inch) for specifying the target resolution for generated bitmaps, default: 72dpi -->
-    <target-resolution>90</target-resolution>
-
-    <!-- Default page-height and page-width, in case
-         value is specified as auto -->
-    <default-page-settings height="11in" width="8.26in"/>
-
-    <renderers>
-        <renderer mime="application/pdf">
-            <filterList>
-                <!-- provides compression using zlib flate (default is on) -->
-                <value>flate</value>
-
-                <!-- encodes binary data into printable ascii characters (default off)
-                     This provides about a 4:5 expansion of data size -->
-                <!-- <value>ascii-85</value> -->
-
-                <!-- encodes binary data with hex representation (default off)
-                     This filter is not recommended as it doubles the data size -->
-                <!-- <value>ascii-hex</value> -->
-            </filterList>
-            <fonts>
-                <directory recursive="true">$fontPath$</directory>
-            </fonts>
-        </renderer>
-    </renderers>
-</fop>

=== removed directory 'target/docbkx/images'
=== removed directory 'target/docbkx/images/callouts'
=== removed file 'target/docbkx/images/callouts/1.svg'
--- target/docbkx/images/callouts/1.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/1.svg	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M10.428,10.411h0.56c3.78,0,4.788-1.96,4.872-3.444h3.22v19.88h-3.92V13.154h-4.732V10.411z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/10.svg'
--- target/docbkx/images/callouts/10.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/10.svg	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.815,10.758h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76v17.04h-3.36V13.11H3.815V10.758z"/>
-		<path style="fill:#FFFFFF;" d="M22.175,7.806c4.009,0,5.904,2.76,5.904,8.736c0,5.975-1.896,8.76-5.904,8.76
-			c-4.008,0-5.904-2.785-5.904-8.76C16.271,10.566,18.167,7.806,22.175,7.806z M22.175,22.613c1.921,0,2.448-1.68,2.448-6.071
-			c0-4.393-0.527-6.049-2.448-6.049c-1.92,0-2.448,1.656-2.448,6.049C19.727,20.934,20.255,22.613,22.175,22.613z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/11.svg'
--- target/docbkx/images/callouts/11.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/11.svg	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M5.209,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H5.209V10.412z"/>
-		<path style="fill:#FFFFFF;" d="M18.553,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.359V12.764h-4.056V10.412z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/12.svg'
--- target/docbkx/images/callouts/12.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/12.svg	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M4.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H4.813V10.412z"/>
-		<path style="fill:#FFFFFF;" d="M17.316,13.484c0-5.545,4.056-6.024,5.568-6.024c3.265,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.553,5.544c-2.256,1.584-3.432,2.353-3.815,3.145h7.392V24.5h-11.64c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.353-2.424c-2.352,0-2.423,1.944-2.447,3.192H17.316z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/13.svg'
--- target/docbkx/images/callouts/13.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/13.svg	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H3.813V10.412z"/>
-		<path style="fill:#FFFFFF;" d="M20.611,14.636h0.529c1.008,0,2.855-0.096,2.855-2.304c0-0.624-0.288-2.185-2.137-2.185
-			c-2.303,0-2.303,2.185-2.303,2.784h-3.12c0-3.191,1.8-5.472,5.64-5.472c2.279,0,5.279,1.152,5.279,4.752
-			c0,1.728-1.08,2.808-2.039,3.24V15.5c0.6,0.168,2.568,1.056,2.568,3.96c0,3.216-2.377,5.496-5.809,5.496
-			c-1.607,0-5.928-0.36-5.928-5.688h3.288l-0.024,0.024c0,0.912,0.24,2.976,2.496,2.976c1.344,0,2.52-0.911,2.52-2.808
-			c0-2.328-2.256-2.424-3.816-2.424V14.636z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/14.svg'
--- target/docbkx/images/callouts/14.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/14.svg	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M4.146,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H4.146V10.412z"/>
-		<path style="fill:#FFFFFF;" d="M28.457,20.732h-1.896V24.5h-3.36v-3.768h-6.72v-2.904L22.746,7.46h3.815v10.656h1.896V20.732z
-			 M23.201,18.116c0-4.128,0.072-6.792,0.072-7.32h-0.048l-4.272,7.32H23.201z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/15.svg'
--- target/docbkx/images/callouts/15.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/15.svg	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.479,11.079h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76v17.04h-3.36V13.43H3.479V11.079z"/>
-		<path style="fill:#FFFFFF;" d="M19.342,14.943c0.625-0.433,1.392-0.937,3.048-0.937c2.279,0,5.16,1.584,5.16,5.496
-			c0,2.328-1.176,6.121-6.192,6.121c-2.664,0-5.376-1.584-5.544-5.016h3.36c0.144,1.391,0.888,2.326,2.376,2.326
-			c1.607,0,2.544-1.367,2.544-3.191c0-1.512-0.72-3.047-2.496-3.047c-0.456,0-1.608,0.023-2.256,1.223l-3-0.143l1.176-9.361h9.36
-			v2.832h-6.937L19.342,14.943z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/16.svg'
--- target/docbkx/images/callouts/16.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/16.svg	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H3.813V10.412z"/>
-		<path style="fill:#FFFFFF;" d="M24.309,11.78c-0.097-0.96-0.721-1.633-1.969-1.633c-2.184,0-2.688,2.496-2.808,4.704L19.58,14.9
-			c0.456-0.624,1.296-1.416,3.191-1.416c3.529,0,5.209,2.712,5.209,5.256c0,3.72-2.28,6.216-5.568,6.216
-			c-5.16,0-6.168-4.32-6.168-8.568c0-3.24,0.432-8.928,6.336-8.928c0.695,0,2.641,0.264,3.48,1.104
-			c0.936,0.912,1.271,1.416,1.584,3.217H24.309z M22.172,16.172c-1.271,0-2.568,0.792-2.568,2.928c0,1.849,1.056,3.168,2.664,3.168
-			c1.225,0,2.353-0.936,2.353-3.239C24.62,16.868,23.229,16.172,22.172,16.172z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/17.svg'
--- target/docbkx/images/callouts/17.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/17.svg	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.479,11.079h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76v17.04h-3.36V13.43H3.479V11.079z"/>
-		<path style="fill:#FFFFFF;" d="M27.838,11.006c-1.631,1.776-5.807,6.816-6.215,14.16h-3.457c0.36-6.816,4.632-12.24,6.072-13.776
-			h-8.472l0.072-2.976h12V11.006z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/18.svg'
--- target/docbkx/images/callouts/18.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/18.svg	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M4.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H4.813V10.412z"/>
-		<path style="fill:#FFFFFF;" d="M23.172,24.956c-4.392,0-5.904-2.856-5.904-5.185c0-0.863,0-3.119,2.592-4.319
-			c-1.344-0.672-2.064-1.752-2.064-3.336c0-2.904,2.328-4.656,5.304-4.656c3.528,0,5.4,2.088,5.4,4.44
-			c0,1.464-0.6,2.712-1.968,3.432c1.632,0.815,2.544,1.896,2.544,4.104C29.076,21.596,27.684,24.956,23.172,24.956z M23.124,16.916
-			c-1.224,0-2.4,0.792-2.4,2.64c0,1.632,0.936,2.712,2.472,2.712c1.752,0,2.424-1.512,2.424-2.688
-			C25.62,18.38,24.996,16.916,23.124,16.916z M25.284,12.26c0-1.296-0.888-2.112-1.968-2.112c-1.512,0-2.305,0.864-2.305,2.112
-			c0,1.008,0.744,2.112,2.185,2.112C24.516,14.372,25.284,13.484,25.284,12.26z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/19.svg'
--- target/docbkx/images/callouts/19.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/19.svg	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M4.146,10.746h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76v17.041h-3.36V13.097H4.146V10.746z"/>
-		<path style="fill:#FFFFFF;" d="M20.225,20.898v0.023c0.192,1.176,0.936,1.68,1.968,1.68c1.392,0,2.783-1.176,2.808-4.752
-			l-0.048-0.049c-0.768,1.152-2.088,1.441-3.24,1.441c-3.264,0-5.16-2.473-5.16-5.329c0-4.176,2.472-6.12,5.808-6.12
-			c5.904,0,6,6.36,6,8.76c0,6.601-3.12,8.736-6.192,8.736c-2.904,0-4.992-1.68-5.28-4.391H20.225z M22.434,16.553
-			c1.176,0,2.472-0.84,2.472-2.855c0-1.944-0.841-3.145-2.568-3.145c-0.864,0-2.424,0.433-2.424,2.88
-			C19.913,16.001,21.161,16.553,22.434,16.553z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/2.svg'
--- target/docbkx/images/callouts/2.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/2.svg	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M9.668,12.328c0-6.469,4.732-7.028,6.496-7.028c3.808,0,6.833,2.24,6.833,6.271
-			c0,3.416-2.213,5.152-4.145,6.469c-2.632,1.848-4.004,2.744-4.452,3.668h8.624v3.472H9.444c0.14-2.324,0.308-4.76,4.62-7.896
-			c3.584-2.604,5.012-3.612,5.012-5.853c0-1.315-0.84-2.828-2.744-2.828c-2.744,0-2.828,2.269-2.856,3.725H9.668z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/20.svg'
--- target/docbkx/images/callouts/20.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/20.svg	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M23.172,7.46c4.008,0,5.904,2.76,5.904,8.736c0,5.976-1.896,8.76-5.904,8.76
-			s-5.904-2.784-5.904-8.76C17.268,10.22,19.164,7.46,23.172,7.46z M23.172,22.268c1.92,0,2.448-1.68,2.448-6.071
-			c0-4.393-0.528-6.049-2.448-6.049s-2.448,1.656-2.448,6.049C20.724,20.588,21.252,22.268,23.172,22.268z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/21.svg'
--- target/docbkx/images/callouts/21.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/21.svg	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M5.306,13.151c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392v2.976H5.114c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H5.306z"/>
-		<path style="fill:#FFFFFF;" d="M19.49,10.079h0.48c3.239,0,4.104-1.681,4.176-2.952h2.761v17.04h-3.361V12.431H19.49V10.079z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/22.svg'
--- target/docbkx/images/callouts/22.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/22.svg	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M17.316,13.484c0-5.545,4.056-6.024,5.568-6.024c3.265,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.553,5.544c-2.256,1.584-3.432,2.353-3.815,3.145h7.392V24.5h-11.64c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.353-2.424c-2.352,0-2.423,1.944-2.447,3.192H17.316z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/23.svg'
--- target/docbkx/images/callouts/23.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/23.svg	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M21.612,14.636h0.528c1.008,0,2.855-0.096,2.855-2.304c0-0.624-0.287-2.185-2.136-2.185
-			c-2.304,0-2.304,2.185-2.304,2.784h-3.12c0-3.191,1.8-5.472,5.64-5.472c2.28,0,5.28,1.152,5.28,4.752
-			c0,1.728-1.08,2.808-2.04,3.24V15.5c0.6,0.168,2.568,1.056,2.568,3.96c0,3.216-2.377,5.496-5.809,5.496
-			c-1.607,0-5.928-0.36-5.928-5.688h3.288l-0.024,0.024c0,0.912,0.24,2.976,2.496,2.976c1.344,0,2.521-0.911,2.521-2.808
-			c0-2.328-2.257-2.424-3.816-2.424V14.636z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/24.svg'
--- target/docbkx/images/callouts/24.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/24.svg	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M4.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H4.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H4.972z"/>
-		<path style="fill:#FFFFFF;" d="M30.124,20.732h-1.896V24.5h-3.36v-3.768h-6.72v-2.904L24.412,7.46h3.816v10.656h1.896V20.732z
-			 M24.868,18.116c0-4.128,0.071-6.792,0.071-7.32h-0.047l-4.272,7.32H24.868z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/25.svg'
--- target/docbkx/images/callouts/25.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/25.svg	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M20.676,14.276c0.624-0.433,1.393-0.937,3.049-0.937c2.279,0,5.16,1.584,5.16,5.496
-			c0,2.328-1.177,6.12-6.193,6.12c-2.664,0-5.375-1.584-5.543-5.016h3.36c0.144,1.392,0.889,2.327,2.376,2.327
-			c1.608,0,2.544-1.367,2.544-3.191c0-1.513-0.72-3.048-2.496-3.048c-0.455,0-1.607,0.023-2.256,1.224l-3-0.144l1.176-9.36h9.36
-			v2.832h-6.937L20.676,14.276z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/26.svg'
--- target/docbkx/images/callouts/26.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/26.svg	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M25.309,11.78c-0.097-0.96-0.721-1.633-1.969-1.633c-2.184,0-2.688,2.496-2.808,4.704L20.58,14.9
-			c0.456-0.624,1.296-1.416,3.191-1.416c3.529,0,5.209,2.712,5.209,5.256c0,3.72-2.28,6.216-5.568,6.216
-			c-5.16,0-6.168-4.32-6.168-8.568c0-3.24,0.432-8.928,6.336-8.928c0.695,0,2.641,0.264,3.48,1.104
-			c0.936,0.912,1.271,1.416,1.584,3.217H25.309z M23.172,16.172c-1.271,0-2.568,0.792-2.568,2.928c0,1.849,1.056,3.168,2.664,3.168
-			c1.225,0,2.353-0.936,2.353-3.239C25.62,16.868,24.229,16.172,23.172,16.172z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/27.svg'
--- target/docbkx/images/callouts/27.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/27.svg	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M29.172,10.34c-1.632,1.776-5.808,6.816-6.216,14.16H19.5c0.36-6.816,4.632-12.24,6.072-13.776
-			H17.1l0.072-2.976h12V10.34z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/28.svg'
--- target/docbkx/images/callouts/28.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/28.svg	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M23.172,24.956c-4.392,0-5.904-2.856-5.904-5.185c0-0.863,0-3.119,2.592-4.319
-			c-1.344-0.672-2.064-1.752-2.064-3.336c0-2.904,2.328-4.656,5.304-4.656c3.528,0,5.4,2.088,5.4,4.44
-			c0,1.464-0.6,2.712-1.968,3.432c1.632,0.815,2.544,1.896,2.544,4.104C29.076,21.596,27.684,24.956,23.172,24.956z M23.124,16.916
-			c-1.224,0-2.4,0.792-2.4,2.64c0,1.632,0.936,2.712,2.472,2.712c1.752,0,2.424-1.512,2.424-2.688
-			C25.62,18.38,24.996,16.916,23.124,16.916z M25.284,12.26c0-1.296-0.888-2.112-1.968-2.112c-1.512,0-2.305,0.864-2.305,2.112
-			c0,1.008,0.744,2.112,2.185,2.112C24.516,14.372,25.284,13.484,25.284,12.26z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/29.svg'
--- target/docbkx/images/callouts/29.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/29.svg	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
-			c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
-			c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
-		<path style="fill:#FFFFFF;" d="M20.893,20.564v0.023c0.191,1.176,0.936,1.68,1.967,1.68c1.393,0,2.785-1.176,2.809-4.752
-			l-0.048-0.048c-0.769,1.152-2.088,1.44-3.24,1.44c-3.264,0-5.16-2.473-5.16-5.328c0-4.176,2.472-6.12,5.807-6.12
-			c5.904,0,6.001,6.36,6.001,8.76c0,6.601-3.12,8.736-6.192,8.736c-2.904,0-4.992-1.68-5.28-4.392H20.893z M23.1,16.22
-			c1.176,0,2.473-0.84,2.473-2.855c0-1.944-0.84-3.145-2.568-3.145c-0.863,0-2.424,0.433-2.424,2.88
-			C20.58,15.668,21.828,16.22,23.1,16.22z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/3.svg'
--- target/docbkx/images/callouts/3.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/3.svg	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M15.127,14.005h0.616c1.176,0,3.332-0.112,3.332-2.688c0-0.728-0.336-2.548-2.492-2.548
-			c-2.688,0-2.688,2.548-2.688,3.248h-3.64c0-3.724,2.1-6.384,6.58-6.384c2.66,0,6.16,1.344,6.16,5.544
-			c0,2.016-1.261,3.276-2.38,3.78v0.056c0.699,0.196,2.996,1.232,2.996,4.62c0,3.752-2.772,6.412-6.776,6.412
-			c-1.876,0-6.916-0.42-6.916-6.636h3.836l-0.028,0.027c0,1.064,0.28,3.473,2.912,3.473c1.568,0,2.94-1.064,2.94-3.276
-			c0-2.716-2.632-2.828-4.452-2.828V14.005z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/30.svg'
--- target/docbkx/images/callouts/30.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/30.svg	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M8.268,14.636h0.528c1.008,0,2.856-0.096,2.856-2.304c0-0.624-0.288-2.185-2.136-2.185
-			c-2.304,0-2.304,2.185-2.304,2.784h-3.12c0-3.191,1.8-5.472,5.64-5.472c2.28,0,5.28,1.152,5.28,4.752
-			c0,1.728-1.08,2.808-2.04,3.24V15.5c0.6,0.168,2.568,1.056,2.568,3.96c0,3.216-2.376,5.496-5.808,5.496
-			c-1.608,0-5.928-0.36-5.928-5.688h3.288l-0.024,0.024c0,0.912,0.24,2.976,2.496,2.976c1.344,0,2.52-0.911,2.52-2.808
-			c0-2.328-2.256-2.424-3.816-2.424V14.636z"/>
-		<path style="fill:#FFFFFF;" d="M23.172,7.46c4.008,0,5.904,2.76,5.904,8.736c0,5.976-1.896,8.76-5.904,8.76
-			s-5.904-2.784-5.904-8.76C17.268,10.22,19.164,7.46,23.172,7.46z M23.172,22.268c1.92,0,2.448-1.68,2.448-6.071
-			c0-4.393-0.528-6.049-2.448-6.049s-2.448,1.656-2.448,6.049C20.724,20.588,21.252,22.268,23.172,22.268z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/4.svg'
--- target/docbkx/images/callouts/4.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/4.svg	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M21.891,20.784h-2.212v4.396h-3.92v-4.396h-7.84v-3.389L15.227,5.3h4.452v12.432h2.212V20.784z
-			 M15.759,17.731c0-4.815,0.084-7.924,0.084-8.54h-0.056l-4.984,8.54H15.759z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/5.svg'
--- target/docbkx/images/callouts/5.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/5.svg	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M14.035,14.252c0.728-0.504,1.624-1.092,3.556-1.092c2.66,0,6.02,1.848,6.02,6.411
-			c0,2.717-1.372,7.141-7.224,7.141c-3.108,0-6.272-1.849-6.468-5.853h3.92c0.168,1.624,1.036,2.717,2.772,2.717
-			c1.876,0,2.968-1.597,2.968-3.725c0-1.764-0.839-3.556-2.912-3.556c-0.532,0-1.876,0.028-2.632,1.428l-3.5-0.168l1.372-10.92
-			h10.919v3.304h-8.092L14.035,14.252z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/6.svg'
--- target/docbkx/images/callouts/6.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/6.svg	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M19.106,10.673c-0.112-1.12-0.84-1.904-2.296-1.904c-2.548,0-3.136,2.912-3.276,5.488l0.056,0.056
-			c0.532-0.728,1.512-1.651,3.724-1.651c4.116,0,6.077,3.164,6.077,6.131c0,4.34-2.66,7.252-6.497,7.252
-			c-6.02,0-7.196-5.039-7.196-9.996c0-3.78,0.504-10.416,7.392-10.416c0.812,0,3.08,0.308,4.061,1.288
-			c1.092,1.063,1.483,1.652,1.848,3.752H19.106z M16.614,15.797c-1.484,0-2.996,0.924-2.996,3.416c0,2.156,1.232,3.697,3.108,3.697
-			c1.428,0,2.745-1.094,2.745-3.781C19.471,16.609,17.846,15.797,16.614,15.797z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/7.svg'
--- target/docbkx/images/callouts/7.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/7.svg	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M24.28,9.66c-1.904,2.071-6.776,7.951-7.252,16.52h-4.032c0.42-7.952,5.404-14.28,7.084-16.072
-			h-9.884l0.084-3.472h14V9.66z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/8.svg'
--- target/docbkx/images/callouts/8.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/8.svg	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M16.28,26.712c-5.124,0-6.888-3.332-6.888-6.048c0-1.009,0-3.641,3.024-5.04
-			c-1.568-0.784-2.408-2.044-2.408-3.893c0-3.388,2.716-5.432,6.188-5.432c4.116,0,6.3,2.436,6.3,5.18
-			c0,1.708-0.7,3.164-2.296,4.004c1.903,0.952,2.968,2.212,2.968,4.788C23.168,22.792,21.544,26.712,16.28,26.712z M16.224,17.332
-			c-1.428,0-2.8,0.924-2.8,3.08c0,1.903,1.092,3.164,2.884,3.164c2.043,0,2.829-1.765,2.829-3.137
-			C19.137,19.04,18.408,17.332,16.224,17.332z M18.744,11.899c0-1.512-1.036-2.464-2.296-2.464c-1.764,0-2.688,1.008-2.688,2.464
-			c0,1.177,0.868,2.464,2.548,2.464C17.848,14.363,18.744,13.328,18.744,11.899z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/callouts/9.svg'
--- target/docbkx/images/callouts/9.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/9.svg	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
-	 style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
-	<g style="enable-background:new    ;">
-		<path style="fill:#FFFFFF;" d="M13.953,21.921v0.027c0.224,1.372,1.092,1.961,2.296,1.961c1.624,0,3.248-1.372,3.276-5.545
-			l-0.057-0.056c-0.896,1.344-2.436,1.68-3.78,1.68c-3.808,0-6.02-2.884-6.02-6.216c0-4.872,2.884-7.14,6.776-7.14
-			c6.888,0,7,7.42,7,10.22c0,7.7-3.641,10.192-7.224,10.192c-3.388,0-5.824-1.96-6.16-5.124H13.953z M16.529,16.853
-			c1.372,0,2.884-0.979,2.884-3.332c0-2.268-0.98-3.668-2.996-3.668c-1.008,0-2.828,0.504-2.828,3.36
-			C13.589,16.209,15.045,16.853,16.529,16.853z"/>
-	</g>
-</g>
-</svg>

=== removed file 'target/docbkx/images/caution.svg'
--- target/docbkx/images/caution.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/caution.svg	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48pt"
-   height="48pt"
-   viewBox="0 0 48 48"
-   xml:space="preserve"
-   id="svg4202"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="caution.svg"><metadata
-   id="metadata4224"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs4222">
-		
-	
-			
-			
-			
-			
-		</defs><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1306"
-   inkscape:window-height="784"
-   id="namedview4220"
-   showgrid="false"
-   inkscape:zoom="14.373972"
-   inkscape:cx="31.692308"
-   inkscape:cy="30"
-   inkscape:window-x="49"
-   inkscape:window-y="50"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="svg4202" />
-	<path
-   style="fill-rule:nonzero;stroke:#ffffff;stroke-width:6.61119986;stroke-miterlimit:4"
-   d="M 41.7,35.3 26.6,9.4 C 26,8.4 24.9,7.7 23.7,7.8 22.5,7.8 21.4,8.5 20.8,9.5 L 6.3,35.4 c -0.6,1 -0.6,2.3 0,3.3 0.6,1 1.7,1.6 2.9,1.6 h 29.6 c 1.2,0 2.3,-0.6 2.9,-1.7 0.6,-1 0.6,-2.3 0,-3.3 z"
-   id="path4207"
-   inkscape:connector-curvature="0" /><path
-   style="fill:#ffffff;fill-rule:nonzero;stroke:#c40022;stroke-width:6.61119986000000015;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-   d="M 23.7,11 9.2,37 H 38.8 L 23.7,11 z"
-   id="path4209"
-   inkscape:connector-curvature="0" /><path
-   style="fill:#ffffff;fill-rule:nonzero;stroke:none"
-   d="M 23.7,11.9 10.3,36.1 H 37.8 L 23.8,12 z"
-   id="path4211"
-   inkscape:connector-curvature="0" /><g
-   style="fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4"
-   id="g4213">
-				<path
-   style="stroke:none"
-   d="m 24.1,34 c -1.1,0 -1.8,-0.8 -1.8,-1.8 0,-1.1 0.7,-1.8 1.8,-1.8 1.1,0 1.8,0.7 1.8,1.8 0,1 -0.7,1.8 -1.8,1.8 h 0 z m -1.2,-4.7 -0.4,-9.1 h 3.2 l -0.4,9.1 H 23 z"
-   id="path4215"
-   inkscape:connector-curvature="0" />
-			</g>
-	<g
-   id="crop_x0020_marks"
-   style="fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-		<path
-   style="fill:none;stroke:none;"
-   d="M48,48H0V0h48v48z"
-   id="path4218" />
-	</g>
-</svg>
\ No newline at end of file

=== removed directory 'target/docbkx/images/cc'
=== removed file 'target/docbkx/images/cc/by-nc-nd.svg'
--- target/docbkx/images/cc/by-nc-nd.svg	2011-09-16 11:05:01 +0000
+++ target/docbkx/images/cc/by-nc-nd.svg	1970-01-01 00:00:00 +0000
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="120"
-   height="42"
-   id="svg2759"
-   sodipodi:version="0.32"
-   inkscape:version="0.45+devel"
-   version="1.0"
-   sodipodi:docname="by-nc-nd.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2761" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#8b8b8b"
-     borderopacity="1"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="179"
-     inkscape:cy="89.569904"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     width="120px"
-     height="42px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1198"
-     inkscape:window-height="624"
-     inkscape:window-x="488"
-     inkscape:window-y="401" />
-  <metadata
-     id="metadata2764">
-    <rdf:RDF>
-      <cc:Work