diff --git a/actions/openstack_upgrade.py b/actions/openstack_upgrade.py
index 2da6062a..38fac62e 100755
--- a/actions/openstack_upgrade.py
+++ b/actions/openstack_upgrade.py
@@ -25,7 +25,7 @@ from neutron_utils import (
 
 from neutron_hooks import (
     config_changed,
-    CONFIGS,
+    resolve_CONFIGS,
 )
 
 
@@ -39,7 +39,7 @@ def openstack_upgrade():
 
     if do_action_openstack_upgrade(NEUTRON_COMMON,
                                    do_openstack_upgrade,
-                                   CONFIGS):
+                                   resolve_CONFIGS()):
         config_changed()
 
 
diff --git a/unit_tests/test_actions_openstack_upgrade.py b/unit_tests/test_actions_openstack_upgrade.py
index 5919eb87..161901b9 100644
--- a/unit_tests/test_actions_openstack_upgrade.py
+++ b/unit_tests/test_actions_openstack_upgrade.py
@@ -14,6 +14,7 @@ TO_PATCH = [
     'config_changed',
     'charmhelpers.core.hookenv.log',
     'charmhelpers.contrib.openstack.utils.juju_log',
+    'resolve_CONFIGS',
 ]