Merge "Handle TZ change in iso8601 >=0.1.12"

2018-01-31 00:36:50 +00:00
parent 64c452d568 11222bbf77
commit 27375b7515
1 changed files with 1 additions and 1 deletions
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -1253,7 +1253,7 @@ def isotime(at=None):
        at = timeutils.utcnow()
    date_string = at.strftime("%Y-%m-%dT%H:%M:%S")
    tz = at.tzinfo.tzname(None) if at.tzinfo else 'UTC'
-    date_string += ('Z' if tz == 'UTC' else tz)
+    date_string += ('Z' if tz in ['UTC', 'UTC+00:00'] else tz)
    return date_string