Merge "More Python package fixes"
diff --git a/lib/cinder b/lib/cinder
index 3472dcd..14950c7 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -234,6 +234,10 @@
iniset $CINDER_CONF DEFAULT state_path $CINDER_STATE_PATH
iniset $CINDER_CONF DEFAULT periodic_interval $CINDER_PERIODIC_INTERVAL
+ if is_service_enabled ceilometer; then
+ iniset $CINDER_CONF DEFAULT notification_driver "cinder.openstack.common.notifier.rpc_notifier"
+ fi
+
if is_service_enabled tls-proxy; then
# Set the service port for a proxy to take the original
iniset $CINDER_CONF DEFAULT osapi_volume_listen_port $CINDER_SERVICE_PORT_INT
diff --git a/lib/tempest b/lib/tempest
index aaa7281..b97f0d8 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -201,6 +201,7 @@
mkdir -p $TEMPEST_STATE_PATH
iniset $TEMPEST_CONF DEFAULT use_stderr False
iniset $TEMPEST_CONF DEFAULT log_file tempest.log
+ iniset $TEMPEST_CONF DEFAULT debug True
# Timeouts
iniset $TEMPEST_CONF compute build_timeout $BUILD_TIMEOUT