From d6db6d0c7e22b45e970299bcfcbb641dfdcc774a Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 8 Sep 2011 15:20:25 +0200 Subject: [PATCH] begin move of cdist-type-emulator to lib/ and submit initial_manifest to cdist Signed-off-by: Nico Schottelius --- bin/cdist | 3 ++- {bin => lib}/cdist-type-emulator | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename {bin => lib}/cdist-type-emulator (100%) diff --git a/bin/cdist b/bin/cdist index 857e127d..6e13188d 100755 --- a/bin/cdist +++ b/bin/cdist @@ -32,6 +32,7 @@ import tempfile BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir)) CONF_DIR = os.path.join(BASE_DIR, "conf") GLOBAL_EXPLORER_DIR = os.path.join(CONF_DIR, "explorer") +LIB_DIR = os.path.join(BASE_DIR, "lib") MANIFEST_DIR = os.path.join(CONF_DIR, "manifest") REMOTE_BASE_DIR = "/var/lib/cdist" @@ -220,7 +221,7 @@ if __name__ == "__main__": log.debug(args) for host in args.host: - c = Cdist(host) + c = Cdist(host, initial_manifest=args.manifest) c.deploy_to() c.cleanup() except KeyboardInterrupt: diff --git a/bin/cdist-type-emulator b/lib/cdist-type-emulator similarity index 100% rename from bin/cdist-type-emulator rename to lib/cdist-type-emulator