--- a/components/openstack/glance/files/glance-upgrade	Mon Apr 04 10:27:24 2016 -0700
+++ b/components/openstack/glance/files/glance-upgrade	Mon Apr 04 12:46:34 2016 -0700
@@ -62,6 +62,9 @@
 }
 
 GLANCE_API_EXCEPTIONS = [
+    ('DEFAULT', 'admin_tenant_name'),
+    ('DEFAULT', 'admin_user'),
+    ('DEFAULT', 'admin_password'),
     ('DEFAULT', 'bind_host'),
     ('DEFAULT', 'bind_port'),
     ('DEFAULT', 'log_file'),

--- a/components/openstack/ironic/files/ironic-upgrade	Mon Apr 04 10:27:24 2016 -0700
+++ b/components/openstack/ironic/files/ironic-upgrade	Mon Apr 04 12:46:34 2016 -0700
@@ -1,6 +1,6 @@
 #!/usr/bin/python2.7
 
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -33,7 +33,14 @@
     ('DEFAULT', 'fake_rabbit'): (None, None),
 }
 
-IRONIC_CONF_EXCEPTIONS = []
+IRONIC_CONF_EXCEPTIONS = [
+    ('keystone_authtoken', 'admin_tenant_name'),
+    ('keystone_authtoken', 'admin_user'),
+    ('keystone_authtoken', 'admin_password'),
+    ('keystone_authtoken', 'signing_dir'),
+    ('ai', 'server'),
+    ('ai', 'username'),
+]
 
 
 def start():

--- a/components/openstack/neutron/files/neutron-upgrade	Mon Apr 04 10:27:24 2016 -0700
+++ b/components/openstack/neutron/files/neutron-upgrade	Mon Apr 04 12:46:34 2016 -0700
@@ -90,11 +90,12 @@
 
         modify_conf('/etc/neutron/api-paste.ini')
         modify_conf('/etc/neutron/dhcp_agent.ini')
-        modify_conf('/etc/neutron/l3_agent.ini', None, L3_AGENT_EXCEPTIONS)
+        modify_conf('/etc/neutron/l3_agent.ini', mapping=None,
+                    exception_list=L3_AGENT_EXCEPTIONS)
         modify_conf('/etc/neutron/neutron.conf', NEUTRON_CONF_MAPPINGS,
                     NEUTRON_CONF_EXCEPTIONS)
-        modify_conf('/etc/neutron/metadata_agent.ini', None,
-                    METADATA_AGENT_EXCEPTIONS)
+        modify_conf('/etc/neutron/metadata_agent.ini', mapping=None,
+                    exception_list=METADATA_AGENT_EXCEPTIONS)
 
     config = iniparse.RawConfigParser()
     config.read('/etc/neutron/neutron.conf')