openstack/manila
Code Issues Proposed changes

Flake8 in bin/*

Browse Source 
Address flake8 issues in the bin directory:
* wrong indents
* Unneeded imports

Change-Id: I183eefc2ff13ed019ab2a041658e6d71a1fa1f57
This commit is contained in:
Andreas Jaeger 2014-08-14 13:11:21 +02:00
parent 90fd87fdc9
commit 94a3b20ff9
5 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/manila-all
View File

@ -34,8 +34,9 @@ import os
import sys
from oslo.config import cfg
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
sys.argv[0]), os.pardir, os.pardir))
possible_topdir = os.path.normpath(os.path.join
(os.path.abspath(sys.argv[0]),
os.pardir, os.pardir))
if os.path.exists(os.path.join(possible_topdir, "manila", "__init__.py")):
sys.path.insert(0, possible_topdir)
@ -51,7 +52,7 @@ CONF = cfg.CONF
if __name__ == '__main__':
CONF(sys.argv[1:], project='manila',
version=version.version_string())
version=version.version_string())
logging.setup("manila")
LOG = logging.getLogger('manila.all')

7
bin/manila-api
View File

@ -31,8 +31,9 @@ import sys
from oslo.config import cfg
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
sys.argv[0]), os.pardir, os.pardir))
possible_topdir = os.path.normpath(os.path.join
(os.path.abspath(sys.argv[0]),
os.pardir, os.pardir))
if os.path.exists(os.path.join(possible_topdir, "manila", "__init__.py")):
sys.path.insert(0, possible_topdir)
@ -48,7 +49,7 @@ CONF = cfg.CONF
if __name__ == '__main__':
CONF(sys.argv[1:], project='manila',
version=version.version_string())
version=version.version_string())
logging.setup("manila")
utils.monkey_patch()
server = service.WSGIService('osapi_share')

8
bin/manila-manage
View File

@ -58,11 +58,6 @@ from __future__ import print_function
import os
import sys
import uuid
from sqlalchemy import create_engine, MetaData, Table
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import sessionmaker
# If ../manila/__init__.py exists, add ../ to Python search path, so that
@ -82,7 +77,6 @@ from manila.common import config # Need to register global_opts
from manila import context
from manila import db
from manila.db import migration
from manila import exception
from manila.openstack.common import log as logging
from manila.openstack.common import uuidutils
from manila import utils
@ -418,7 +412,7 @@ def main():
try:
CONF(sys.argv[1:], project='manila',
version=version.version_string())
version=version.version_string())
logging.setup("manila")
except cfg.ConfigFilesNotFoundError:
cfgfile = CONF.config_file[-1] if CONF.config_file else None

2
bin/manila-scheduler
View File

@ -47,7 +47,7 @@ CONF = cfg.CONF
if __name__ == '__main__':
CONF(sys.argv[1:], project='manila',
version=version.version_string())
version=version.version_string())
logging.setup("manila")
utils.monkey_patch()
server = service.Service.create(binary='manila-scheduler')

7
bin/manila-share
View File

@ -46,16 +46,15 @@ CONF = cfg.CONF
if __name__ == '__main__':
args = CONF(sys.argv[1:], project='manila',
version=version.version_string())
version=version.version_string())
logging.setup("manila")
utils.monkey_patch()
launcher = service.ProcessLauncher()
if CONF.enabled_share_backends:
for backend in CONF.enabled_share_backends:
host = "%s@%s" % (CONF.host, backend)
server = service.Service.create(
host=host,
service_name=backend)
server = service.Service.create(host=host,
service_name=backend)
launcher.launch_server(server)
else:
server = service.Service.create(binary='manila-share')