--- a/components/openstack/swift/files/swift-upgrade	Tue Apr 28 12:29:58 2015 -0400
+++ b/components/openstack/swift/files/swift-upgrade	Tue Apr 28 11:51:13 2015 -0700
@@ -64,6 +64,7 @@
         for key, value in section_items:
             # keep a copy of the old value
             oldvalue = value
+            oldsection = section
 
             if not new.has_section(section):
                 if section != 'DEFAULT':
@@ -87,6 +88,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")