Fix rsync commands
There was a problem in inheritance of rsync commands. Change-Id: Icf770b48894b8e78edcc1e688a745d97f71be37e Closes-bug: 1523885
This commit is contained in:
parent
fb008cd417
commit
b6f2503597
|
@ -20,7 +20,6 @@ import six
|
|||
|
||||
from fuel_dev_tools import command
|
||||
from fuel_dev_tools import exc
|
||||
from fuel_dev_tools import rsync
|
||||
from fuel_dev_tools import ssh
|
||||
|
||||
|
||||
|
@ -201,8 +200,7 @@ class RestartCommand(command.BaseCommand):
|
|||
self.restart_container()
|
||||
|
||||
|
||||
class RsyncCommand(rsync.RsyncMixin,
|
||||
command.BaseCommand):
|
||||
class RsyncCommand(command.RsyncCommand):
|
||||
@property
|
||||
def base_target_dir(self):
|
||||
return os.path.join(
|
||||
|
|
|
@ -17,7 +17,6 @@ import os
|
|||
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
|
||||
|
||||
|
||||
|
@ -27,9 +26,8 @@ class PuppetInfo(info.BasicInfo):
|
|||
return ''
|
||||
|
||||
|
||||
class Rsync(rsync.RsyncMixin,
|
||||
ssh.SSHMixin,
|
||||
command.BaseCommand):
|
||||
class Rsync(ssh.SSHMixin,
|
||||
command.RsyncCommand):
|
||||
"""Rsync local directory to the Docker container."""
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
|
|
|
@ -15,13 +15,11 @@
|
|||
import os
|
||||
|
||||
from fuel_dev_tools import command
|
||||
from fuel_dev_tools import rsync
|
||||
from fuel_dev_tools import ssh
|
||||
|
||||
|
||||
class Rsync(rsync.RsyncMixin,
|
||||
ssh.SSHMixin,
|
||||
command.BaseCommand):
|
||||
class Rsync(ssh.SSHMixin,
|
||||
command.RsyncCommand):
|
||||
"""Rsync local CLI directory to the main machine."""
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
|
|
|
@ -15,15 +15,13 @@
|
|||
from fuel_dev_tools import command
|
||||
from fuel_dev_tools.docker import astute
|
||||
from fuel_dev_tools.docker import mcollective
|
||||
from fuel_dev_tools import rsync
|
||||
from fuel_dev_tools import slaves
|
||||
from fuel_dev_tools import ssh
|
||||
|
||||
|
||||
class Rsync(slaves.SlavesMixin,
|
||||
ssh.SSHMixin,
|
||||
rsync.RsyncMixin,
|
||||
command.BaseCommand):
|
||||
command.RsyncCommand):
|
||||
|
||||
def target_for_slave(self, slave):
|
||||
if slave['status'] in ['discover', 'error']:
|
||||
|
|
Loading…
Reference in New Issue