OpenStack Compute (nova)

Merge lp:~vishvananda/nova/novash into lp:~hudson-openstack/nova/trunk

  1. novash
  2. Merge into trunk
Proposed by Vish Ishaya
Status: Merged
Approved by: Soren Hansen
Approved revision: 426
Merged at revision: 426
Proposed branch: lp:~vishvananda/nova/novash
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 53 lines (+10/-10)
1 file modified
contrib/nova.sh (+10/-10)
To merge this branch: bzr merge lp:~vishvananda/nova/novash
Reviewer Review Type Date Requested Status
Soren Hansen (community) Approve
Michael Gundlach (community) Approve
Review via email: mp+42174@code.launchpad.net

Commit message

Default flagfile moved in trunk recently. This updates nova.sh to run properly with the new flagfile location.

Description of the change

Default flagfile moved in trunk recently. This updates nova.sh to run properly with the new flagfile location.

To post a comment you must log in.
Revision history for this message
Michael Gundlach (gundlach) wrote :

oh yayer

review: Approve
Revision history for this message
Soren Hansen (soren) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contrib/nova.sh'
2--- contrib/nova.sh 2010-11-23 23:58:26 +0000
3+++ contrib/nova.sh 2010-11-29 21:27:16 +0000
4@@ -23,7 +23,7 @@
5 TEST=${TEST:-0}
6 USE_LDAP=${USE_LDAP:-0}
7 LIBVIRT_TYPE=${LIBVIRT_TYPE:-qemu}
8-NET_MAN=${NET_MAN:-FlatDHCPManager}
9+NET_MAN=${NET_MAN:-VlanManager}
10 # NOTE(vish): If you are using FlatDHCP on multiple hosts, set the interface
11 # below but make sure that the interface doesn't already have an
12 # ip or you risk breaking things.
13@@ -42,10 +42,10 @@
14 fi
15
16 mkdir -p /etc/nova
17-cat >/etc/nova/nova-manage.conf << NOVA_CONF_EOF
18+cat >$NOVA_DIR/bin/nova.conf << NOVA_CONF_EOF
19 --verbose
20 --nodaemon
21---dhcpbridge_flagfile=/etc/nova/nova-manage.conf
22+--dhcpbridge_flagfile=$NOVA_DIR/bin/nova.conf
23 --FAKE_subdomain=ec2
24 --network_manager=nova.network.manager.$NET_MAN
25 --cc_host=$HOST_IP
26@@ -56,7 +56,7 @@
27 NOVA_CONF_EOF
28
29 if [ -n "$FLAT_INTERFACE" ]; then
30- echo "--flat_interface=$FLAT_INTERFACE" >>/etc/nova/nova-manage.conf
31+ echo "--flat_interface=$FLAT_INTERFACE" >>$NOVA_DIR/bin/nova.conf
32 fi
33
34 if [ "$CMD" == "branch" ]; then
35@@ -142,12 +142,12 @@
36
37 # nova api crashes if we start it with a regular screen command,
38 # so send the start command by forcing text into the window.
39- screen_it api "$NOVA_DIR/bin/nova-api --flagfile=/etc/nova/nova-manage.conf"
40- screen_it objectstore "$NOVA_DIR/bin/nova-objectstore --flagfile=/etc/nova/nova-manage.conf"
41- screen_it compute "$NOVA_DIR/bin/nova-compute --flagfile=/etc/nova/nova-manage.conf"
42- screen_it network "$NOVA_DIR/bin/nova-network --flagfile=/etc/nova/nova-manage.conf"
43- screen_it scheduler "$NOVA_DIR/bin/nova-scheduler --flagfile=/etc/nova/nova-manage.conf"
44- screen_it volume "$NOVA_DIR/bin/nova-volume --flagfile=/etc/nova/nova-manage.conf"
45+ screen_it api "$NOVA_DIR/bin/nova-api"
46+ screen_it objectstore "$NOVA_DIR/bin/nova-objectstore"
47+ screen_it compute "$NOVA_DIR/bin/nova-compute"
48+ screen_it network "$NOVA_DIR/bin/nova-network"
49+ screen_it scheduler "$NOVA_DIR/bin/nova-scheduler"
50+ screen_it volume "$NOVA_DIR/bin/nova-volume"
51 screen_it test ". $NOVA_DIR/novarc"
52 screen -S nova -x
53 fi