diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-30 22:44:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-30 22:44:43 +0000 |
| commit | ed0b56c50dba876a6cdca02482dbf1a117a91311 (patch) | |
| tree | 73acc7baec183c10cfdb94ef641cfbad199e688f /bin | |
| parent | 57aa58630d2362a6753eb861c8afd9abb682db3b (diff) | |
| parent | 0ce533e0e194741b6ade7eed12c107628d0e6d3d (diff) | |
Merge "fixing issue with db.volume_update not returning the volume_ref"
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/volume-usage-audit | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bin/volume-usage-audit b/bin/volume-usage-audit index d8591557c..0329d184e 100755 --- a/bin/volume-usage-audit +++ b/bin/volume-usage-audit @@ -57,15 +57,14 @@ from nova import flags from nova import log as logging from nova import rpc from nova import utils -import nova.volume.utils - +from nova.volume import utils as volume_utils FLAGS = flags.FLAGS if __name__ == '__main__': rpc.register_opts(FLAGS) admin_context = context.get_admin_context() - utils.default_flagfile() + utils.default_cfgfile() flags.FLAGS(sys.argv) logging.setup() begin, end = utils.last_completed_audit_period() @@ -77,7 +76,7 @@ if __name__ == '__main__': print "Found %d volumes" % len(volumes) for volume_ref in volumes: try: - nova.volume.utils.notify_usage_exists( + volume_utils.notify_usage_exists( admin_context, volume_ref) except Exception, e: print traceback.format_exc(e) |