andrewschleifer/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

BUGFIX: export global explorer with path from remote

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-08 03:24:05 +02:00
parent d190b192de
commit e10ebeadf8
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/cdist/config_install.py
View file

@ -24,6 +24,7 @@ import logging
import os import os
import stat import stat
import sys import sys
import time
import cdist.context import cdist.context
import cdist.core import cdist.core
@ -230,7 +231,7 @@ class ConfigInstall:
output_fd = open(os.path.join(dst_path, explorer), mode='w') output_fd = open(os.path.join(dst_path, explorer), mode='w')
cmd = [] cmd = []
cmd.append("__explorer=" + remote_dst_path) cmd.append("__explorer=" + remote_dst_path)
cmd.append(os.path.join(src_path, explorer)) cmd.append(os.path.join(remote_dst_path, explorer))
cdist.exec.run_or_fail(cmd, stdout=output_fd, remote_prefix=True) cdist.exec.run_or_fail(cmd, stdout=output_fd, remote_prefix=True)
output_fd.close() output_fd.close()
@ -252,8 +253,11 @@ class ConfigInstall:
def deploy_and_cleanup(self): def deploy_and_cleanup(self):
"""Do what is most often done: deploy & cleanup""" """Do what is most often done: deploy & cleanup"""
start_time = time.time()
self.deploy_to() self.deploy_to()
self.cleanup() self.cleanup()
log.info("Finished run of %s in %s seconds",
self.target_host, time.time() - start_time)
def stage_prepare(self): def stage_prepare(self):
"""Do everything for a deploy, minus the actual code stage""" """Do everything for a deploy, minus the actual code stage"""