diff --git a/contrib/devstack/lib/climate b/contrib/devstack/lib/climate
index 839870ae..22ea1390 100644
--- a/contrib/devstack/lib/climate
+++ b/contrib/devstack/lib/climate
@@ -85,6 +85,14 @@ function configure_climate() {
     iniset $CLIMATE_CONF_FILE DEFAULT os_admin_username climate
     iniset $CLIMATE_CONF_FILE DEFAULT os_admin_project_name $SERVICE_TENANT_NAME
 
+    # keystone authtoken
+    iniset $CLIMATE_CONF_FILE keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
+    iniset $CLIMATE_CONF_FILE keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
+    iniset $CLIMATE_CONF_FILE keystone_authtoken admin_user climate
+    iniset $CLIMATE_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD
+    iniset $CLIMATE_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
+    configure_API_version $CLIMATE_CONF_FILE 3
+
     iniset $CLIMATE_CONF_FILE physical:host climate_username $CLIMATE_USER_NAME
     iniset $CLIMATE_CONF_FILE physical:host climate_password $SERVICE_PASSWORD
     iniset $CLIMATE_CONF_FILE physical:host climate_project_name $SERVICE_TENANT_NAME