Compatibility with openstack-gate PEP8
Change-Id: I07fd9d0ea4614d0918a2ac198ab8db7f3132553f
This commit is contained in:
parent
9e7067ff82
commit
cbcf3a52fb
|
@ -12,6 +12,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
|
||||
class CmdParserMixin(object):
|
||||
"""Mixin for parsing fuel CLI output."""
|
||||
|
||||
|
@ -33,4 +34,4 @@ class CmdParserMixin(object):
|
|||
values = [v.strip() for v in line.split('|')]
|
||||
ret.append(dict(zip(header, values)))
|
||||
|
||||
return ret
|
||||
return ret
|
||||
|
|
|
@ -37,13 +37,13 @@ class DockerMixin(ssh.SSHMixin):
|
|||
|
||||
def container_command(self, *commands):
|
||||
return [
|
||||
#'lxc-attach', '--name', self.get_full_docker_id()
|
||||
# 'lxc-attach', '--name', self.get_full_docker_id()
|
||||
'docker', 'exec', self.get_docker_id()
|
||||
] + list(commands)
|
||||
|
||||
def container_command_interactive(self, *commands):
|
||||
return [
|
||||
#'lxc-attach', '--name', self.get_full_docker_id()
|
||||
# 'lxc-attach', '--name', self.get_full_docker_id()
|
||||
'docker', 'exec', '-it', self.get_docker_id()
|
||||
] + list(commands)
|
||||
|
||||
|
|
|
@ -32,7 +32,8 @@ class AstuteInfo(DockerAstuteMixin, info.BasicInfo):
|
|||
def get_info(cls):
|
||||
return """Admin token is stored in /etc/fuel/astute.yaml on Fuel Main.
|
||||
|
||||
If you want to send custom receiverd response from Astute: http://sprunge.us/UJfb
|
||||
If you want to send custom receiverd response from Astute:
|
||||
http://sprunge.us/UJfb
|
||||
"""
|
||||
|
||||
|
||||
|
|
|
@ -49,7 +49,8 @@ class DBReset(DockerNailgunMixin,
|
|||
from fuel_dev_tools.docker import postgres
|
||||
|
||||
reset_sql = """
|
||||
SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND datname = 'nailgun';
|
||||
SELECT pg_terminate_backend(pid) FROM pg_stat_activity
|
||||
WHERE pid <> pg_backend_pid() AND datname = 'nailgun';
|
||||
DROP DATABASE nailgun;
|
||||
CREATE DATABASE nailgun WITH OWNER nailgun;
|
||||
"""
|
||||
|
|
|
@ -12,9 +12,6 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import six
|
||||
import subprocess
|
||||
|
||||
from fuel_dev_tools import docker
|
||||
from fuel_dev_tools import info
|
||||
|
||||
|
|
|
@ -14,9 +14,9 @@
|
|||
|
||||
import os
|
||||
|
||||
from fuel_dev_tools import info
|
||||
from fuel_dev_tools import command
|
||||
from fuel_dev_tools import docker
|
||||
from fuel_dev_tools import info
|
||||
from fuel_dev_tools import rsync
|
||||
from fuel_dev_tools import ssh
|
||||
|
||||
|
|
|
@ -29,7 +29,8 @@ class RsyncMixin(object):
|
|||
return parser
|
||||
|
||||
def build_app_args_target(self, target):
|
||||
target = '{}@{}:{}'.format(self.app_args.user, self.app_args.ip, target)
|
||||
target = '{}@{}:{}'.format(self.app_args.user,
|
||||
self.app_args.ip, target)
|
||||
args = ['-e', 'ssh -p {}'.format(self.app_args.port)]
|
||||
|
||||
return target, args
|
||||
|
@ -37,10 +38,10 @@ class RsyncMixin(object):
|
|||
def rsync(self, source, target, *args):
|
||||
self.print_debug('RSYNC: %s --> %s' % (source, target))
|
||||
|
||||
#result = project.rsync_project(
|
||||
# result = project.rsync_project(
|
||||
# local_dir=source,
|
||||
# remote_dir=target
|
||||
#)
|
||||
# )
|
||||
|
||||
result = subprocess.check_output(
|
||||
['rsync', '-avz'] + list(args) + [source, target]
|
||||
|
|
|
@ -33,11 +33,11 @@ from fuel_dev_tools.docker import nailgun
|
|||
from fuel_dev_tools.docker import nginx
|
||||
from fuel_dev_tools.docker import postgres
|
||||
from fuel_dev_tools.docker import rabbitmq
|
||||
from fuel_dev_tools.slaves import mcagent
|
||||
from fuel_dev_tools import exc
|
||||
from fuel_dev_tools import info
|
||||
from fuel_dev_tools import puppet
|
||||
from fuel_dev_tools import pythonclient
|
||||
from fuel_dev_tools.slaves import mcagent
|
||||
from fuel_dev_tools import ssh
|
||||
|
||||
|
||||
|
|
|
@ -33,7 +33,8 @@ class SSHMixin(object):
|
|||
super(SSHMixin, self).__init__(*args, **kwargs)
|
||||
|
||||
if self.app_args:
|
||||
fabric_api.env.host_string = '{0}:{1}'.format(self.app_args.ip, self.app_args.port)
|
||||
fabric_api.env.host_string = '{0}:{1}'.format(self.app_args.ip,
|
||||
self.app_args.port)
|
||||
fabric_api.env.user = self.app_args.user
|
||||
|
||||
if not self.app_args.debug:
|
||||
|
@ -41,8 +42,8 @@ class SSHMixin(object):
|
|||
fabric.state.output[key] = False
|
||||
|
||||
def send_identity(self):
|
||||
self.print_debug('Sending identity %s for passwordless authentication' %
|
||||
self.app_args.identity_file)
|
||||
self.print_debug('Sending identity %s for passwordless '
|
||||
'authentication' % self.app_args.identity_file)
|
||||
|
||||
with open('%s.pub' % self.app_args.identity_file) as f:
|
||||
contents = f.read()
|
||||
|
@ -103,14 +104,14 @@ class SSHMixin(object):
|
|||
# NOTE: fabric's open_shell is broken: it's TERM or something like
|
||||
# that that breaks arrow keys for browsing history in Bash, etc.
|
||||
|
||||
#command = None
|
||||
|
||||
#if args:
|
||||
#command = ' '.join(args)
|
||||
|
||||
#self.print_debug('interactive %s' % command)
|
||||
|
||||
#fabric_api.open_shell(command=command)
|
||||
# command = None
|
||||
#
|
||||
# if args:
|
||||
# command = ' '.join(args)
|
||||
#
|
||||
# self.print_debug('interactive %s' % command)
|
||||
#
|
||||
# fabric_api.open_shell(command=command)
|
||||
|
||||
commands = [
|
||||
'ssh', '-t',
|
||||
|
|
Loading…
Reference in New Issue