diff -r 287ebf81b849 -r 3ac4ce913bec components/openstack/keystone/files/keystone-upgrade
--- a/components/openstack/keystone/files/keystone-upgrade	Wed Apr 22 13:06:06 2015 -0700
+++ b/components/openstack/keystone/files/keystone-upgrade	Thu Apr 23 14:20:50 2015 -0600
@@ -175,6 +175,7 @@
         for key, value in section_items:
             # keep a copy of the old value
             oldvalue = value
+            oldsection = section
 
             if mapping is not None:
                 section, key = update_mapping(section, key, mapping)
@@ -205,6 +206,7 @@
             if not new.has_option(section, key) or \
                '%SERVICE' in new.get(section, key):
                 new.set(section, key, value)
+            section = oldsection
 
     # copy the old conf file to a backup
     today = datetime.now().strftime("%Y%m%d%H%M%S")