Merge "Fixes: Openstack HA : Glance image list fails on juno"

Juniper · May 28, 2015 · a9d252b · a9d252b
2 parents 468c8cd + d1d6827
commit a9d252b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/contrail_provisioning/openstack/scripts/contrail-token-clean.sh b/contrail_provisioning/openstack/scripts/contrail-token-clean.sh
@@ -47,7 +47,8 @@ for myip in $MYIPS
 if [ $viponme -eq 1 ]; then
     log_info_msg "keystone-cleaner::Starting token cleanup"
 
-    mysql -u${mysql_user} -p${mysql_password} -h${mysql_host} -P${mysql_port} -e "USE keystone ; DELETE FROM token where expires <= convert_tz(now(),@@session.time_zone,'+01:00');"
+    NOW=`date -u +"%Y-%m-%d %T"`
+    mysql -u${mysql_user} -p${mysql_password} -h${mysql_host} -P${mysql_port} -e "USE keystone ; DELETE FROM token where expires <= '${NOW}';"
     valid_token=$($mysql -u${mysql_user} -p${mysql_password} -h${mysql_host} -P${mysql_port} -e "USE keystone ; SELECT count(*) FROM token;")
     valid_token=$(echo $valid_token | awk '{print $2}')