From 5816737c4a970beaae87d5abaf82a06303ee2ce7 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Mon, 14 Sep 2015 20:15:24 +0000
Subject: [PATCH] code cleanup

---
 actions/openstack_upgrade.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/actions/openstack_upgrade.py b/actions/openstack_upgrade.py
index d73234c4..dc9b4444 100755
--- a/actions/openstack_upgrade.py
+++ b/actions/openstack_upgrade.py
@@ -4,8 +4,13 @@ import uuid
 
 sys.path.append('hooks/')
 
+from charmhelpers.contrib.openstack.utils import (
+    do_action_openstack_upgrade,
+)
+
 from charmhelpers.core.hookenv import (
-    config,
+    relation_ids,
+    relation_set,
 )
 
 from cinder_hooks import config_changed
@@ -27,10 +32,8 @@ def openstack_upgrade():
     code to run, otherwise a full service level upgrade will fire
     on config-changed."""
 
-    if (do_action_openstack_upgrade('cinder-common',
-                                    config('action-managed-upgrade'),
-                                    do_openstack_upgrade(),
-                                    CONFIGS)):
+    if (do_action_openstack_upgrade(do_openstack_upgrade,
+                                    CONFIGS, package='cinder-common')):
         # NOTE(jamespage) tell any storage-backends we just
         # upgraded
         for rid in relation_ids('storage-backend'):