From b39ed2f496f984e0bff46d20f894a116fb7e441e Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Mon, 21 Nov 2011 15:15:43 -0800 Subject: [PATCH] fix extra flags handling Change-Id: Ifecf908b1949e2afc8874f2fcccd741e34c50b8d --- stack.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/stack.sh b/stack.sh index cdba542..caa2d59 100755 --- a/stack.sh +++ b/stack.sh @@ -475,9 +475,9 @@ git_clone $NOVA_REPO $NOVA_DIR $NOVA_BRANCH git_clone $NOVACLIENT_REPO $NOVACLIENT_DIR $NOVACLIENT_BRANCH # glance, swift middleware and nova api needs keystone middleware -if [[ "$ENABLED_SERVICES" =~ "key" || - "$ENABLED_SERVICES" =~ "g-api" || - "$ENABLED_SERVICES" =~ "n-api" || +if [[ "$ENABLED_SERVICES" =~ "key" || + "$ENABLED_SERVICES" =~ "g-api" || + "$ENABLED_SERVICES" =~ "n-api" || "$ENABLED_SERVICES" =~ "swift" ]]; then # unified auth system (manages accounts/tokens) git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH @@ -517,9 +517,9 @@ fi # setup our checkouts so they are installed into python path # allowing ``import nova`` or ``import glance.client`` -if [[ "$ENABLED_SERVICES" =~ "key" || - "$ENABLED_SERVICES" =~ "g-api" || - "$ENABLED_SERVICES" =~ "n-api" || +if [[ "$ENABLED_SERVICES" =~ "key" || + "$ENABLED_SERVICES" =~ "g-api" || + "$ENABLED_SERVICES" =~ "n-api" || "$ENABLED_SERVICES" =~ "swift" ]]; then cd $KEYSTONE_DIR; sudo python setup.py develop fi @@ -961,7 +961,7 @@ fi # You can define extra nova conf flags by defining the array EXTRA_FLAGS, # For Example: EXTRA_FLAGS=(--foo --bar=2) for I in "${EXTRA_FLAGS[@]}"; do - add_nova_flag $i + add_nova_flag $I done # XenServer