diff options
| author |   Alex Yang <yangyang1@zte.com.cn> | 2017-05-27 10:01:19 +0800 |
|---|---|---|
| committer | Alex Yang <yangyang1@zte.com.cn> | 2017-05-27 11:41:23 +0800 |
| commit | 20064215eaea1c01fa0a6d52ace2ec420b9d9e0f (patch) | |
| tree | ec84ac042460e01c87e0ad714d3179beb3f49010 /deploy | |
| parent | 278452281b011cf009133993907fd47338255e50 (diff) | |
Call python script directly in preparation & post-phase
Avoid calling python though a bash in the deployment script of python.
Change-Id: I655c7b919ea5970ff842ac03cafed11b82d03601
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/daisy_server.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/deploy/daisy_server.py b/deploy/daisy_server.py index ec30ec95..5fa09577 100644 --- a/deploy/daisy_server.py +++ b/deploy/daisy_server.py @@ -205,8 +205,9 @@ class DaisyServer(object): if self.adapter != 'libvirt': return LI('Prepare some configuration files') - cmd = 'bash {script} -n {net_file}'.format( - script=path_join(self.remote_dir, 'deploy/prepare.sh'), + cmd = 'export PYTHONPATH={python_path}; python {script} -nw {net_file}'.format( + python_path=self.remote_dir, + script=path_join(self.remote_dir, 'deploy/prepare/execute.py'), net_file=path_join(self.remote_dir, 'network.yml')) self.ssh_run(cmd) @@ -258,7 +259,8 @@ class DaisyServer(object): def post_deploy(self): LI('Post deploy ...') - cmd = 'bash {script} -n {net_file}'.format( - script=path_join(self.remote_dir, 'deploy/post.sh'), + cmd = 'export PYTHONPATH={python_path}; python {script} -nw {net_file}'.format( + python_path=self.remote_dir, + script=path_join(self.remote_dir, 'deploy/post/execute.py'), net_file=path_join(self.remote_dir, 'network.yml')) self.ssh_run(cmd, check=False) |