Skip to content

Commit 66d47a2

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Backport new style XenServer install to essex" into stable/essex
2 parents 1c809fb + 4ec0a8a commit 66d47a2

17 files changed

+1239
-538
lines changed

‎stack.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ function read_password {
293293
if [ "$VIRT_DRIVER" = 'xenserver' ]; then
294294
PUBLIC_INTERFACE_DEFAULT=eth3
295295
# allow build_domU.sh to specify the flat network bridge via kernel args
296-
FLAT_NETWORK_BRIDGE_DEFAULT=$(grep -o 'flat_network_bridge=[^.]*' /proc/cmdline | cut -d= -f 2)
296+
FLAT_NETWORK_BRIDGE_DEFAULT=$(grep -o 'flat_network_bridge=[[:alnum:]]*' /proc/cmdline | cut -d= -f 2 | sort -u)
297297
GUEST_INTERFACE_DEFAULT=eth1
298298
else
299299
PUBLIC_INTERFACE_DEFAULT=br100

‎tools/xen/README.md‎

Lines changed: 30 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Getting Started With XenServer 5.6 and Devstack
22
===============================================
33
The purpose of the code in this directory it to help developers bootstrap
4-
a XenServer 5.6 + Openstack development environment. This file gives
4+
a XenServer 5.6 (or greater) + Openstack development environment. This file gives
55
some pointers on how to get started.
66

77
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):
2525
* XenServer Gateway: 192.168.1.1
2626
* XenServer DNS: 192.168.1.1
2727

28-
Note:
29-
------
30-
It is advisable (and necessary if you are using Xenserver 6.0, due to space
31-
limitations), to create the above mentioned OS domU, on a separate dev machine.
32-
To do this, you will need to run Steps 2 on the dev machine (if required) as
33-
well as the Xenserver host. Steps 3 and 4 should be run on the dev machine.
34-
This process requires you to be root on the dev machine.
35-
36-
Step 2: Prepare DOM0
37-
-------------------
38-
At this point, your host is missing some critical software that you will
39-
need to run devstack (like git). Do this to install required software:
40-
41-
wget --no-check-certificate https://raw.github.com/openstack-dev/devstack/master/tools/xen/prepare_dom0.sh
42-
chmod 755 prepare_dom0.sh
43-
./prepare_dom0.sh
28+
Step 2: Download devstack
29+
--------------------------
30+
On your XenServer host, run the following commands as root:
4431

45-
This step will also clone devstack in $DEVSTACKSRCROOT/devstack.
46-
$DEVSTACKSRCROOT=/root by default.
32+
wget --no-check-certificate https://github.com/openstack-dev/devstack/zipball/master
33+
unzip -o master -d ./devstack
34+
cd devstack/*/
4735

48-
Step 3: Configure your localrc
49-
-----------------------------
36+
Step 3: Configure your localrc inside the devstack directory
37+
------------------------------------------------------------
5038
Devstack uses a localrc for user-specific configuration. Note that
5139
the XENAPI_PASSWORD must be your dom0 root password.
5240
Of course, use real passwords if this machine is exposed.
5341

54-
cat > $DEVSTACKSRCROOT/devstack/localrc <<EOF
42+
cat > ./localrc <<EOF
5543
MYSQL_PASSWORD=my_super_secret
5644
SERVICE_TOKEN=my_super_secret
5745
ADMIN_PASSWORD=my_super_secret
46+
SERVICE_PASSWORD=$ADMIN_PASSWORD
5847
RABBIT_PASSWORD=my_super_secret
5948
# This is the password for your guest (for both stack and root users)
6049
GUEST_PASSWORD=my_super_secret
@@ -70,33 +59,31 @@ Of course, use real passwords if this machine is exposed.
7059
ACTIVE_TIMEOUT=45
7160
# Interface on which you would like to access services
7261
HOST_IP_IFACE=ethX
62+
# First time Ubuntu network install params
63+
NETINSTALLIP="dhcp"
64+
NAMESERVERS=""
65+
NETMASK=""
66+
GATEWAY=""
7367
EOF
7468

75-
Step 4: Run ./build_xva.sh
76-
--------------------------
77-
This script prepares your nova xva image. If you run this on a different machine,
78-
copy the resulting xva file to tools/xen/xvas/[GUEST_NAME].xva
79-
(by default tools/xen/xvas/ALLINONE.xva) on the Xenserver host.
69+
Step 4: Run ./install_os_domU.sh from the tools/xen directory
70+
-------------------------------------------------------------
71+
cd tools/xen
72+
./install_os_domU.sh
8073

81-
cd $DEVSTACKSRCROOT/devstack/tools/xen
82-
./build_xva.sh
74+
Once this script finishes executing, log into the VM (openstack domU)
75+
that it installed and tail the run.sh.log file. You will need to wait
76+
until it run.sh has finished executing.
8377

84-
You will also need to copy your localrc to the Xenserver host.
8578

86-
Step 5: Run ./build_domU.sh
87-
--------------------------
88-
This script does a lot of stuff, it is probably best to read it in its entirety.
89-
But in a nutshell, it performs the following:
90-
91-
* Configures bridges and vlans for public, private, and management nets
92-
* Creates and installs a OpenStack all-in-one domU in an HA-FlatDHCP configuration
93-
* A script to create a multi-domU (ie. head node separated from compute) configuration is coming soon!
94-
95-
cd $DEVSTACKSRCROOT/devstack/tools/xen
96-
./build_domU.sh
97-
98-
Step 6: Do cloudy stuff!
79+
Step 5: Do cloudy stuff!
9980
--------------------------
10081
* Play with horizon
10182
* Play with the CLI
10283
* Log bugs to devstack and core projects, and submit fixes!
84+
85+
Step 6: Run from snapshot
86+
-------------------------
87+
If you want to quicky re-run devstack from a clean state,
88+
using the same settings you used in your previous run,
89+
you can revert the DomU to the snapshot called "before_first_boot"

‎tools/xen/build_domU.sh‎

Lines changed: 0 additions & 244 deletions
This file was deleted.

0 commit comments

Comments
 (0)