Change-Id: I683b8df20c23c8fa997804b49067f0f02377854d
Jenkins authored on 2011/11/24 01:31:53... | ... |
@@ -475,9 +475,9 @@ git_clone $NOVA_REPO $NOVA_DIR $NOVA_BRANCH |
475 | 475 |
git_clone $NOVACLIENT_REPO $NOVACLIENT_DIR $NOVACLIENT_BRANCH |
476 | 476 |
|
477 | 477 |
# glance, swift middleware and nova api needs keystone middleware |
478 |
-if [[ "$ENABLED_SERVICES" =~ "key" || |
|
479 |
- "$ENABLED_SERVICES" =~ "g-api" || |
|
480 |
- "$ENABLED_SERVICES" =~ "n-api" || |
|
478 |
+if [[ "$ENABLED_SERVICES" =~ "key" || |
|
479 |
+ "$ENABLED_SERVICES" =~ "g-api" || |
|
480 |
+ "$ENABLED_SERVICES" =~ "n-api" || |
|
481 | 481 |
"$ENABLED_SERVICES" =~ "swift" ]]; then |
482 | 482 |
# unified auth system (manages accounts/tokens) |
483 | 483 |
git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH |
... | ... |
@@ -517,9 +517,9 @@ fi |
517 | 517 |
|
518 | 518 |
# setup our checkouts so they are installed into python path |
519 | 519 |
# allowing ``import nova`` or ``import glance.client`` |
520 |
-if [[ "$ENABLED_SERVICES" =~ "key" || |
|
521 |
- "$ENABLED_SERVICES" =~ "g-api" || |
|
522 |
- "$ENABLED_SERVICES" =~ "n-api" || |
|
520 |
+if [[ "$ENABLED_SERVICES" =~ "key" || |
|
521 |
+ "$ENABLED_SERVICES" =~ "g-api" || |
|
522 |
+ "$ENABLED_SERVICES" =~ "n-api" || |
|
523 | 523 |
"$ENABLED_SERVICES" =~ "swift" ]]; then |
524 | 524 |
cd $KEYSTONE_DIR; sudo python setup.py develop |
525 | 525 |
fi |
... | ... |
@@ -961,7 +961,7 @@ fi |
961 | 961 |
# You can define extra nova conf flags by defining the array EXTRA_FLAGS, |
962 | 962 |
# For Example: EXTRA_FLAGS=(--foo --bar=2) |
963 | 963 |
for I in "${EXTRA_FLAGS[@]}"; do |
964 |
- add_nova_flag $i |
|
964 |
+ add_nova_flag $I |
|
965 | 965 |
done |
966 | 966 |
|
967 | 967 |
# XenServer |