pep8 compliant fixes

This commit is contained in:
Mike Perez 2012-03-14 12:39:23 -07:00
parent 87c34e1bab
commit 86870ee930
3 changed files with 8 additions and 9 deletions

View File

@ -59,7 +59,7 @@ BLACKHOLE_DIR = '.blackhole'
#TODO: maybe this should be a subclass that handles these differences
APACHE_SVC_NAME = {
settings.RHEL6: 'httpd',
settings.FEDORA16: 'httpd',
settings.FEDORA16: 'httpd',
settings.UBUNTU11: 'apache2',
}
APACHE_RESTART_CMD = ['service', '%SERVICE%', 'restart']

View File

@ -29,7 +29,6 @@ from devstack import utils
from devstack.components import db
from devstack.components import keystone
#id
TYPE = settings.NOVA
LOG = logging.getLogger('devstack.components.nova')
@ -83,19 +82,19 @@ VG_LVREMOVE_CMD = [
'run_as_root': True}
]
# iscsi restart commands
# iscsi restart commands
RESTART_TGT_CMD = {
settings.UBUNTU11: [
settings.UBUNTU11: [
{'cmd': ['stop', 'tgt'], 'run_as_root': True},
{'cmd': ['start', 'tgt'], 'run_as_root': True}
{'cmd': ['start', 'tgt'], 'run_as_root': True}
],
settings.RHEL6: [
settings.RHEL6: [
{'cmd': ['service', 'tgtd', 'stop'], 'run_as_root': True},
{'cmd': ['service', 'tgtd', 'start'], 'run_as_root': True}
{'cmd': ['service', 'tgtd', 'start'], 'run_as_root': True}
],
settings.FEDORA16: [
{'cmd': ['service', 'tgtd', 'stop'], 'run_as_root': True},
{'cmd': ['service', 'tgtd', 'start'], 'run_as_root': True}
{'cmd': ['service', 'tgtd', 'start'], 'run_as_root': True}
],
}

View File

@ -89,7 +89,7 @@ class RcWriter(object):
lines.extend(self._make_dict_export(self._get_ec2_envs()))
lines.append("")
return lines
def _get_password_envs(self):
to_set = dict()
for (out_name, key) in PASSWORDS_MAKES.items():