Merge "Use the site-wide boto.cfg"
diff --git a/lib/tempest b/lib/tempest
index 8ef578b..5ca217e 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -65,7 +65,7 @@
 
 
 BOTO_MATERIALS_PATH="$FILES/images/s3-materials/cirros-${CIRROS_VERSION}"
-BOTO_CONF=$TEMPEST_DIR/boto.cfg
+BOTO_CONF=/etc/boto.cfg
 
 # Cinder/Volume variables
 TEMPEST_VOLUME_DRIVER=${TEMPEST_VOLUME_DRIVER:-default}