josch/devstack_custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

make SQL_CONN an ENV, change order of screened items

Browse source
This commit is contained in:
Jesse Andrews 2011-09-12 19:00:28 -07:00
parent 73e27b83e5
commit 55508d62e7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
stack.sh
View file

@ -38,7 +38,7 @@ NET_MAN=${NET_MAN:-VlanManager}
# TODO: set rabbitmq conn string explicitly as well # TODO: set rabbitmq conn string explicitly as well
# TODO: switch to mysql for all services # TODO: switch to mysql for all services
SQL_CONN=sqlite:///$NOVA_DIR/nova.sqlite SQL_CONN=${SQL_CONN:-sqlite:///$NOVA_DIR/nova.sqlite}
# FIXME: commands should be: stack.sh should allow specifying a subset of services # FIXME: commands should be: stack.sh should allow specifying a subset of services
@ -188,14 +188,14 @@ $NOVA_DIR/bin/nova-manage floating create $FLOATING_RANGE
rm -rf /var/lib/glance/images/* rm -rf /var/lib/glance/images/*
rm -f $GLANCE_DIR/glance.sqlite rm -f $GLANCE_DIR/glance.sqlite
screen_it n-api "$NOVA_DIR/bin/nova-api"
screen_it g-api "cd $GLANCE_DIR; bin/glance-api --config-file=etc/glance-api.conf" screen_it g-api "cd $GLANCE_DIR; bin/glance-api --config-file=etc/glance-api.conf"
screen_it g-reg "cd $GLANCE_DIR; bin/glance-registry --config-file=etc/glance-registry.conf" screen_it g-reg "cd $GLANCE_DIR; bin/glance-registry --config-file=etc/glance-registry.conf"
screen_it cpu "$NOVA_DIR/bin/nova-compute"
screen_it net "$NOVA_DIR/bin/nova-network"
screen_it sched "$NOVA_DIR/bin/nova-scheduler"
screen_it key "$KEYSTONE_DIR/bin/keystone --config-file $KEYSTONE_DIR/etc/keystone.conf" screen_it key "$KEYSTONE_DIR/bin/keystone --config-file $KEYSTONE_DIR/etc/keystone.conf"
screen_it vnc "$NOVA_DIR/bin/nova-vncproxy" screen_it n-api "$NOVA_DIR/bin/nova-api"
screen_it n-cpu "$NOVA_DIR/bin/nova-compute"
screen_it n-net "$NOVA_DIR/bin/nova-network"
screen_it n-sch "$NOVA_DIR/bin/nova-scheduler"
screen_it n-vnc "$NOVA_DIR/bin/nova-vncproxy"
screen_it dash "/etc/init.d/apache2 restart; tail -f /var/log/apache2/error.log" screen_it dash "/etc/init.d/apache2 restart; tail -f /var/log/apache2/error.log"