more cleanups from refactoring
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
74dc5b96cb
commit
0197f8da13
2 changed files with 12 additions and 10 deletions
|
@ -35,6 +35,7 @@ import tempfile
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
TYPE_PREFIX = "__"
|
TYPE_PREFIX = "__"
|
||||||
|
CODE_HEADER = "#!/bin/sh -e\n"
|
||||||
|
|
||||||
class Cdist:
|
class Cdist:
|
||||||
"""Cdist main class to hold arbitrary data"""
|
"""Cdist main class to hold arbitrary data"""
|
||||||
|
@ -102,7 +103,7 @@ class Cdist:
|
||||||
log.debug("%s exploring %s using %s storing to %s",
|
log.debug("%s exploring %s using %s storing to %s",
|
||||||
cdist_object, explorer, remote_cmd, output)
|
cdist_object, explorer, remote_cmd, output)
|
||||||
|
|
||||||
self.run_or_fail(remote_cmd, stdout=output_fd, remote_prefix=self.remote_prefix)
|
cdist.exec.run_or_fail(remote_cmd, stdout=output_fd, remote_prefix=self.remote_prefix)
|
||||||
output_fd.close()
|
output_fd.close()
|
||||||
|
|
||||||
def init_deploy(self):
|
def init_deploy(self):
|
||||||
|
@ -240,7 +241,7 @@ class Cdist:
|
||||||
self.run_initial_manifest()
|
self.run_initial_manifest()
|
||||||
|
|
||||||
old_objects = []
|
old_objects = []
|
||||||
objects = self.list_objects()
|
objects = self.path.list_objects()
|
||||||
|
|
||||||
# Continue process until no new objects are created anymore
|
# Continue process until no new objects are created anymore
|
||||||
while old_objects != objects:
|
while old_objects != objects:
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
|
import shutil
|
||||||
import sys
|
import sys
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
|
@ -31,7 +32,6 @@ REMOTE_OBJECT_DIR = os.path.join(REMOTE_BASE_DIR, "object")
|
||||||
REMOTE_TYPE_DIR = os.path.join(REMOTE_CONF_DIR, "type")
|
REMOTE_TYPE_DIR = os.path.join(REMOTE_CONF_DIR, "type")
|
||||||
REMOTE_GLOBAL_EXPLORER_DIR = os.path.join(REMOTE_CONF_DIR, "explorer")
|
REMOTE_GLOBAL_EXPLORER_DIR = os.path.join(REMOTE_CONF_DIR, "explorer")
|
||||||
|
|
||||||
CODE_HEADER = "#!/bin/sh -e\n"
|
|
||||||
DOT_CDIST = ".cdist"
|
DOT_CDIST = ".cdist"
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
@ -55,9 +55,13 @@ def file_to_list(filename):
|
||||||
class Path:
|
class Path:
|
||||||
"""Class that handles path related configurations"""
|
"""Class that handles path related configurations"""
|
||||||
|
|
||||||
def __init__(self, target_host,
|
def __init__(self,
|
||||||
initial_manifest=False, remote_user="root",
|
target_host,
|
||||||
remote_prefix=False, base_dir=None, debug=False):
|
remote_user,
|
||||||
|
remote_prefix,
|
||||||
|
initial_manifest=False,
|
||||||
|
base_dir=None,
|
||||||
|
debug=False):
|
||||||
|
|
||||||
# Base and Temp Base
|
# Base and Temp Base
|
||||||
if base_dir:
|
if base_dir:
|
||||||
|
@ -69,10 +73,7 @@ class Path:
|
||||||
self.target_host = target_host
|
self.target_host = target_host
|
||||||
|
|
||||||
self.remote_user = remote_user
|
self.remote_user = remote_user
|
||||||
if remote_prefix:
|
self.remote_prefix = remote_prefix
|
||||||
self.remote_prefix = remote_prefix
|
|
||||||
else:
|
|
||||||
self.remote_prefix = ["ssh", self.remote_user + "@" + self.target_host]
|
|
||||||
|
|
||||||
self.conf_dir = os.path.join(self.base_dir, "conf")
|
self.conf_dir = os.path.join(self.base_dir, "conf")
|
||||||
self.cache_base_dir = os.path.join(self.base_dir, "cache")
|
self.cache_base_dir = os.path.join(self.base_dir, "cache")
|
||||||
|
|
Loading…
Reference in a new issue