Merge "Properly initialize rpc in cinder-volume-usage-audit" into stable/icehouse

This commit is contained in:
Jenkins 2014-06-03 03:51:24 +00:00 committed by Gerrit Code Review
commit f8f612332a

View File

@ -55,6 +55,7 @@ gettextutils.install('cinder')
from cinder import context from cinder import context
from cinder import db from cinder import db
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder import rpc
from cinder import utils from cinder import utils
from cinder import version from cinder import version
import cinder.volume.utils import cinder.volume.utils
@ -86,6 +87,7 @@ if __name__ == '__main__':
version=version.version_string()) version=version.version_string())
logging.setup("cinder") logging.setup("cinder")
LOG = logging.getLogger("cinder") LOG = logging.getLogger("cinder")
rpc.init(CONF)
begin, end = utils.last_completed_audit_period() begin, end = utils.last_completed_audit_period()
if CONF.start_time: if CONF.start_time:
begin = datetime.strptime(CONF.start_time, "%Y-%m-%d %H:%M:%S") begin = datetime.strptime(CONF.start_time, "%Y-%m-%d %H:%M:%S")