Browse code

fix logging and move keystone client earlier in the install chain

Vishvananda Ishaya authored on 2012/02/07 06:21:52
Showing 2 changed files
... ...
@@ -5,8 +5,8 @@ admin_token = %SERVICE_TOKEN%
5 5
 compute_port = 3000
6 6
 verbose = True
7 7
 debug = True
8
-# should use stdout for devstack, but leaving this for now
9
-log_file = %DEST%/keystone/keystone.log
8
+# commented out so devstack logs to stdout
9
+# log_file = %DEST%/keystone/keystone.log
10 10
 
11 11
 # ================= Syslog Options ============================
12 12
 # Send logs to syslog (/dev/log) instead of to file specified
... ...
@@ -653,6 +653,8 @@ fi
653 653
 
654 654
 # setup our checkouts so they are installed into python path
655 655
 # allowing ``import nova`` or ``import glance.client``
656
+cd $KEYSTONECLIENT_DIR; sudo python setup.py develop
657
+cd $NOVACLIENT_DIR; sudo python setup.py develop
656 658
 if [[ "$ENABLED_SERVICES" =~ "key" ||
657 659
       "$ENABLED_SERVICES" =~ "g-api" ||
658 660
       "$ENABLED_SERVICES" =~ "n-api" ||
... ...
@@ -667,10 +669,8 @@ if [[ "$ENABLED_SERVICES" =~ "g-api" ||
667 667
       "$ENABLED_SERVICES" =~ "n-api" ]]; then
668 668
     cd $GLANCE_DIR; sudo python setup.py develop
669 669
 fi
670
-cd $NOVACLIENT_DIR; sudo python setup.py develop
671 670
 cd $NOVA_DIR; sudo python setup.py develop
672 671
 if [[ "$ENABLED_SERVICES" =~ "horizon" ]]; then
673
-    cd $KEYSTONECLIENT_DIR; sudo python setup.py develop
674 672
     cd $HORIZON_DIR/horizon; sudo python setup.py develop
675 673
     cd $HORIZON_DIR/openstack-dashboard; sudo python setup.py develop
676 674
 fi