Slave rsync moved to SlavesMixin
Change-Id: Iac00db278f178c04941a11ffe70d78b673c7551b
This commit is contained in:
parent
75d4fbae21
commit
a0a1a92cc2
|
@ -15,15 +15,30 @@
|
|||
from fabric import api as fabric_api
|
||||
|
||||
from fuel_dev_tools import cmd_parser
|
||||
from fuel_dev_tools import ssh
|
||||
|
||||
|
||||
class SlavesMixin(cmd_parser.CmdParserMixin, ssh.SSHMixin):
|
||||
class SlavesMixin(cmd_parser.CmdParserMixin):
|
||||
def discover_slaves(self):
|
||||
slaves = self.ssh_command('fuel', 'node')
|
||||
|
||||
return self.parse_output(slaves)
|
||||
|
||||
def rsync_slave(self, slave, source, target):
|
||||
self.print_debug('Syncing to slave {name} [{ip}]'.format(**slave))
|
||||
|
||||
target = ':{}'.format(target)
|
||||
|
||||
hop_args = [
|
||||
'-e',
|
||||
'ssh -A -t root@{} -p {} ssh -A -t root@{}'.format(
|
||||
self.app_args.ip,
|
||||
self.app_args.port,
|
||||
slave['ip']
|
||||
)
|
||||
]
|
||||
|
||||
self.rsync(source, target, *hop_args)
|
||||
|
||||
def slave_command(self, slave, *cmd):
|
||||
cmd = [
|
||||
'ssh', '-A', '-t',
|
||||
|
|
|
@ -48,21 +48,10 @@ class Rsync(slaves.SlavesMixin,
|
|||
|
||||
def take_action(self, parsed_args):
|
||||
for slave in self.discover_slaves():
|
||||
self.print_debug('Syncing to slave {name} [{ip}]'.format(**slave))
|
||||
|
||||
source = parsed_args.source
|
||||
target = ':{}'.format(self.target_for_slave(slave))
|
||||
target = self.target_for_slave(slave)
|
||||
|
||||
hop_args = [
|
||||
'-e',
|
||||
'ssh -A -t root@{} -p {} ssh -A -t root@{}'.format(
|
||||
self.app_args.ip,
|
||||
self.app_args.port,
|
||||
slave['ip']
|
||||
)
|
||||
]
|
||||
|
||||
self.rsync(source, target, *hop_args)
|
||||
self.rsync_slave(slave, source, target)
|
||||
|
||||
self.print_debug('Restarting mcollective')
|
||||
self.slave_command(slave, '/etc/init.d/mcollective', 'restart')
|
||||
|
|
Loading…
Reference in New Issue