From c0ae3164308011dd10f31a4b9b44a6f96fd923f5 Mon Sep 17 00:00:00 2001
From: Renuka Apte <renuka.apte@citrix.com>
Date: Thu, 5 Apr 2012 17:18:27 -0700
Subject: [PATCH] XenServer new install: modify README

Modify the README to specify the new steps to install Openstack on
XenServer. Specifically, the new install will use a network-installed
Ubuntu VM on the XenServer host and install the OpenStack services on it.
This eliminates the need for the dev machine (which was required
with XenServer 6.0 and above).

Change-Id: I5f86aa7929754e04ec4a959053c3fb871e3cda76
---
 tools/xen/README.md | 68 +++++++++++++--------------------------------
 1 file changed, 19 insertions(+), 49 deletions(-)

diff --git a/tools/xen/README.md b/tools/xen/README.md
index 020ec99d09..b77bbb51ea 100644
--- a/tools/xen/README.md
+++ b/tools/xen/README.md
@@ -1,7 +1,7 @@
 Getting Started With XenServer 5.6 and Devstack
 ===============================================
 The purpose of the code in this directory it to help developers bootstrap
-a XenServer 5.6 + Openstack development environment.  This file gives
+a XenServer 5.6 (or greater) + Openstack development environment.  This file gives
 some pointers on how to get started.
 
 Xenserver is a Type 1 hypervisor, so it needs to be installed on bare metal.
@@ -25,36 +25,25 @@ getting started (I use settings like this with a lappy + cheap wifi router):
 * XenServer Gateway: 192.168.1.1
 * XenServer DNS: 192.168.1.1
 
-Note:
-------
-It is advisable (and necessary if you are using Xenserver 6.0, due to space
-limitations), to create the above mentioned OS domU, on a separate dev machine.
-To do this, you will need to run Steps 2 on the dev machine (if required) as
-well as the Xenserver host. Steps 3 and 4 should be run on the dev machine.
-This process requires you to be root on the dev machine.
+Step 2: Download devstack
+--------------------------
+On your XenServer host, run the following commands as root:
 
-Step 2: Prepare DOM0
--------------------
-At this point, your host is missing some critical software that you will
-need to run devstack (like git).  Do this to install required software:
+wget --no-check-certificate https://github.com/openstack-dev/devstack/zipball/master
+unzip -o master -d ./devstack
+cd devstack/*/
 
-    wget --no-check-certificate https://raw.github.com/openstack-dev/devstack/master/tools/xen/prepare_dom0.sh
-    chmod 755 prepare_dom0.sh
-    ./prepare_dom0.sh
-
-This step will also clone devstack in $DEVSTACKSRCROOT/devstack.
-$DEVSTACKSRCROOT=/root by default.
-
-Step 3: Configure your localrc
------------------------------
+Step 3: Configure your localrc inside the devstack directory
+------------------------------------------------------------
 Devstack uses a localrc for user-specific configuration.  Note that
 the XENAPI_PASSWORD must be your dom0 root password.
 Of course, use real passwords if this machine is exposed.
 
-    cat > $DEVSTACKSRCROOT/devstack/localrc <<EOF
+    cat > ./localrc <<EOF
     MYSQL_PASSWORD=my_super_secret
     SERVICE_TOKEN=my_super_secret
     ADMIN_PASSWORD=my_super_secret
+    SERVICE_PASSWORD=$ADMIN_PASSWORD
     RABBIT_PASSWORD=my_super_secret
     # This is the password for your guest (for both stack and root users)
     GUEST_PASSWORD=my_super_secret
@@ -72,37 +61,18 @@ Of course, use real passwords if this machine is exposed.
     HOST_IP_IFACE=ethX
     EOF
 
-Step 4: Run ./build_xva.sh
---------------------------
-This script prepares your nova xva image. If you run this on a different machine,
-copy the resulting xva file to tools/xen/xvas/[GUEST_NAME].xva
-(by default tools/xen/xvas/ALLINONE.xva) on the Xenserver host.
+Step 4: Run ./install_os_domU.sh from the tools/xen directory
+-------------------------------------------------------------
+cd tools/xen
+./install_os_domU.sh
 
-cd $DEVSTACKSRCROOT/devstack/tools/xen
-./build_xva.sh
+Once this script finishes executing, log into the VM (openstack domU)
+that it installed and tail the run.sh.log file. You will need to wait
+until it run.sh has finished executing.
 
-You will also need to copy your localrc to the Xenserver host.
 
-Step 5: Run ./build_domU.sh
---------------------------
-This script does a lot of stuff, it is probably best to read it in its entirety.
-But in a nutshell, it performs the following:
-
-* Configures bridges and vlans for public, private, and management nets
-* Creates and installs a OpenStack all-in-one domU in an HA-FlatDHCP configuration
-* A script to create a multi-domU (ie. head node separated from compute) configuration is coming soon!
-
-cd $DEVSTACKSRCROOT/devstack/tools/xen
-./build_domU.sh
-
-Step 6: Do cloudy stuff!
+Step 5: Do cloudy stuff!
 --------------------------
 * Play with horizon
 * Play with the CLI
 * Log bugs to devstack and core projects, and submit fixes!
-
-Ubuntu 11.10 VM on Xenserver
-----------------------------
-Run ./scripts/xenoneirictemplate.sh on your Xenserver host. This creates a
-template to be able to install a Ubuntu Oneiric (11.10) virtual machine.
-Once the template is created, follow the wizard to complete the network install.