From d72ea8a9e8270654d360e38eaf217a02503be91e Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sun, 17 Mar 2013 16:24:47 -0700 Subject: [PATCH] Correct Keystone 1.1 authentication token timeout We should renew after 30 minutes, not 30 hours. --- .../java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java | 2 +- .../main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java index e57effb8cf..e832962941 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java @@ -82,7 +82,7 @@ public class NovaApiMetadata extends BaseRestApiMetadata { // Keystone 1.1 expires tokens after 24 hours and allows renewal 1 hour // before expiry by default. We choose a value less than the latter // since the former persists between jclouds invocations. - properties.setProperty(PROPERTY_SESSION_INTERVAL, 30 * 60 * 60 + ""); + properties.setProperty(PROPERTY_SESSION_INTERVAL, 30 * 60 + ""); return properties; } diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java index 45a10668c2..86690aa254 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java @@ -70,7 +70,7 @@ public class SwiftApiMetadata extends BaseRestApiMetadata { // Keystone 1.1 expires tokens after 24 hours and allows renewal 1 hour // before expiry by default. We choose a value less than the latter // since the former persists between jclouds invocations. - properties.setProperty(PROPERTY_SESSION_INTERVAL, 30 * 60 * 60 + ""); + properties.setProperty(PROPERTY_SESSION_INTERVAL, 30 * 60 + ""); return properties; }