diff options
| author |   Alex Yang <yangyang1@zte.com.cn> | 2017-06-29 15:11:41 +0800 |
|---|---|---|
| committer | Alex Yang <yangyang1@zte.com.cn> | 2017-06-29 15:11:41 +0800 |
| commit | 1fb71914ea6f6528a5f9ffefef6bdbaf16fd5137 (patch) | |
| tree | 463fb518497d6ab01c37f245c8ce5d3ab0ffb1a8 | |
| parent | e76ff3b87a1c3991a0fede4f4efdc4716bf6825f (diff) | |
Add an missing parameter and fix a typo in daisy_server.py
Change-Id: I339508f1c07a9bbefa389c6f6eb5e53640a79417
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
| -rw-r--r-- | deploy/daisy_server.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/deploy/daisy_server.py b/deploy/daisy_server.py index 223b2b1c..eb711afd 100644 --- a/deploy/daisy_server.py +++ b/deploy/daisy_server.py @@ -209,10 +209,11 @@ class DaisyServer(object): if self.adapter != 'libvirt': return LI('Prepare some configuration files') - cmd = 'export PYTHONPATH={python_path}; python {script} -nw {net_file}'.format( + cmd = 'export PYTHONPATH={python_path}; python {script} -nw {net_file} -b {is_bare}'.format( python_path=self.remote_dir, script=path_join(self.remote_dir, 'deploy/prepare/execute.py'), - net_file=path_join(self.remote_dir, self.net_file_name)) + net_file=path_join(self.remote_dir, self.net_file_name), + is_bare=1 if self.adapter == 'ipmi' else 0) self.ssh_run(cmd) def prepare_cluster(self, deploy_file, net_file): @@ -231,7 +232,7 @@ class DaisyServer(object): def prepare_host_and_pxe(self): LI('Prepare host and PXE') - cmd = "python {script} --dha {deploy_file} --network {net_file} --host \'yes\' --isbare {is_bare} --scenario {scenarion}".format( + cmd = "python {script} --dha {deploy_file} --network {net_file} --host \'yes\' --isbare {is_bare} --scenario {scenario}".format( script=path_join(self.remote_dir, 'deploy/tempest.py'), deploy_file=path_join(self.remote_dir, self.deploy_file_name), net_file=path_join(self.remote_dir, self.net_file_name), |