--- a/components/openstack/cinder/files/cinder-upgrade	Wed Apr 29 14:14:32 2015 -0600
+++ b/components/openstack/cinder/files/cinder-upgrade	Wed Apr 29 13:58:24 2015 -0700
@@ -166,6 +166,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)
@@ -196,6 +197,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")