Merge "Changed so that nova databases are only created once in a multi-host setup."
diff --git a/exercises/bundle.sh b/exercises/bundle.sh
index daff5f9..12f2732 100755
--- a/exercises/bundle.sh
+++ b/exercises/bundle.sh
@@ -51,7 +51,7 @@
truncate -s 5M /tmp/$IMAGE
euca-bundle-image -i /tmp/$IMAGE || die "Failure bundling image $IMAGE"
-euca-upload-bundle -b $BUCKET -m /tmp/$IMAGE.manifest.xml || die "Failure uploading bundle $IMAGE to $BUCKET"
+euca-upload-bundle --debug -b $BUCKET -m /tmp/$IMAGE.manifest.xml || die "Failure uploading bundle $IMAGE to $BUCKET"
AMI=`euca-register $BUCKET/$IMAGE.manifest.xml | cut -f2`
die_if_not_set AMI "Failure registering $BUCKET/$IMAGE"
diff --git a/lib/cinder b/lib/cinder
index 5477e26..2b2f8f1 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -307,7 +307,11 @@
done
if is_service_enabled c-vol; then
- stop_service tgt
+ if is_ubuntu; then
+ stop_service tgt
+ else
+ stop_service tgtd
+ fi
fi
}
diff --git a/lib/keystone b/lib/keystone
index 7950fa9..4dddedb 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -133,7 +133,7 @@
echo "catalog.RegionOne.network.name = Quantum Service" >> $KEYSTONE_CATALOG
fi
- sudo sed -e "
+ sed -e "
s,%SERVICE_HOST%,$SERVICE_HOST,g;
s,%S3_SERVICE_PORT%,$S3_SERVICE_PORT,g;
" -i $KEYSTONE_CATALOG