--- a/components/openstack/cinder/files/cinder-upgrade	Tue Apr 28 12:29:58 2015 -0400
+++ b/components/openstack/cinder/files/cinder-upgrade	Tue Apr 28 11:51:13 2015 -0700
@@ -163,6 +163,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)
@@ -193,6 +194,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")

--- a/components/openstack/glance/files/glance-upgrade	Tue Apr 28 12:29:58 2015 -0400
+++ b/components/openstack/glance/files/glance-upgrade	Tue Apr 28 11:51:13 2015 -0700
@@ -172,6 +172,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)
@@ -202,6 +203,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")

--- a/components/openstack/heat/files/heat-upgrade	Tue Apr 28 12:29:58 2015 -0400
+++ b/components/openstack/heat/files/heat-upgrade	Tue Apr 28 11:51:13 2015 -0700
@@ -161,6 +161,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)
@@ -191,6 +192,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")

--- a/components/openstack/keystone/files/keystone-upgrade	Tue Apr 28 12:29:58 2015 -0400
+++ b/components/openstack/keystone/files/keystone-upgrade	Tue Apr 28 11:51:13 2015 -0700
@@ -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")

--- a/components/openstack/neutron/files/neutron-upgrade	Tue Apr 28 12:29:58 2015 -0400
+++ b/components/openstack/neutron/files/neutron-upgrade	Tue Apr 28 11:51:13 2015 -0700
@@ -143,6 +143,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)
@@ -173,6 +174,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")

--- a/components/openstack/nova/files/nova-upgrade	Tue Apr 28 12:29:58 2015 -0400
+++ b/components/openstack/nova/files/nova-upgrade	Tue Apr 28 11:51:13 2015 -0700
@@ -221,6 +221,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)
@@ -251,6 +252,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")

--- 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")