summaryrefslogtreecommitdiffstats
path: root/doctor_tests
diff options
context:
space:
mode:
authordongwenjuan <dong.wenjuan@zte.com.cn>2018-01-15 09:43:46 +0800
committerdongwenjuan <dong.wenjuan@zte.com.cn>2018-01-15 09:43:46 +0800
commit3883c8521ff02dc75c377970b8cae271538fdb42 (patch)
tree479e6b5f454e2ea50c8ab9d73733c2fbfbb55924 /doctor_tests
parentf106c5a12724c684d747cf7f309f0ccc8b86cc61 (diff)
fix the pep8 check
Change-Id: I91b8b6cd07d859a1d1abdc25f015a3c3b2756fab Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
Diffstat (limited to 'doctor_tests')
-rw-r--r--doctor_tests/installer/apex.py10
-rw-r--r--doctor_tests/installer/daisy.py13
2 files changed, 14 insertions, 9 deletions
diff --git a/doctor_tests/installer/apex.py b/doctor_tests/installer/apex.py
index aaacb38..90304a2 100644
--- a/doctor_tests/installer/apex.py
+++ b/doctor_tests/installer/apex.py
@@ -96,13 +96,13 @@ class ApexInstaller(BaseInstaller):
def setup_stunnel(self):
self.log.info('Setup ssh stunnel in controller nodes'
- ' in Apex installer......')
+ 'in Apex installer......')
for node_ip in self.controllers:
cmd = ("ssh -o UserKnownHostsFile=/dev/null"
- "-o StrictHostKeyChecking=no"
- "-i %s %s@%s -R %s:localhost:%s"
- "sleep 600 > ssh_tunnel.%s.log"
- "2>&1 < /dev/null &"
+ " -o StrictHostKeyChecking=no"
+ " -i %s %s@%s -R %s:localhost:%s"
+ " sleep 600 > ssh_tunnel.%s.log"
+ " 2>&1 < /dev/null &"
% (self.key_file,
self.node_user_name,
node_ip,
diff --git a/doctor_tests/installer/daisy.py b/doctor_tests/installer/daisy.py
index 65d7a7e..3b1fbb2 100644
--- a/doctor_tests/installer/daisy.py
+++ b/doctor_tests/installer/daisy.py
@@ -97,11 +97,16 @@ class DaisyInstaller(BaseInstaller):
self.nova.flavors.create(self.conf.flavor, 512, 1, 1)
def setup_stunnel(self):
- self.log.info('Setup ssh stunnel in controller nodes in Daisy installer......')
+ self.log.info('Setup ssh stunnel in controller nodes'
+ 'in Daisy installer......')
for node_ip in self.controllers:
- cmd = "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i %s %s@%s -R %s:localhost:%s sleep 600 > ssh_tunnel.%s 2>&1 < /dev/null &" \
- % (self.key_file, self.node_user_name, node_ip,
- self.conf.consumer.port, self.conf.consumer.port, node_ip)
+ cmd = ("ssh -o UserKnownHostsFile=/dev/null"
+ " -o StrictHostKeyChecking=no"
+ " -i %s %s@%s -R %s:localhost:%s"
+ " sleep 600 > ssh_tunnel.%s 2>&1 < /dev/null &"
+ % (self.key_file, self.node_user_name,
+ node_ip, self.conf.consumer.port,
+ self.conf.consumer.port, node_ip))
server = subprocess.Popen(cmd, shell=True)
self.servers.append(server)
server.communicate()