From 7ab0d60b1aa8a9470594d897d642036baf9fc9c2 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 13 Aug 2012 20:17:07 -0400 Subject: [PATCH] update config code --- lib/ansible/constants.py | 24 ------------------------ library/command | 1 + 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index c5363babac..7094132ce4 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -33,16 +33,13 @@ def get_config(p, section, key, env_var, default): return os.environ.get(env_var, default) return default - def load_config_file(): p = ConfigParser.ConfigParser() path1 = os.path.expanduser("~/.ansible.cfg") path2 = "/etc/ansible/ansible.cfg" if os.path.exists(path1): - print "A1" p.read(path1) elif os.path.exists(path2): - print "A2" p.read(path2) else: return None @@ -77,24 +74,3 @@ DEFAULT_TRANSPORT_OPTS = ['local', 'paramiko', 'ssh'] DEFAULT_SUDO_PASS = None DEFAULT_SUBSET = None -def get_config(parser, section, key, env_var, default): - try: - return parser.get(section, key) - except: - if env_var is not None: - return os.environ.get(env_var, default) - return default - -def load_config_file(): - config = ConfigParser.ConfigParser() - path1 = os.path.expanduser("~/.ansible.cfg") - path2 = "/etc/ansible/ansible.cfg" - if os.path.exists(path1): - config.read(path1) - elif os.path.exists(path2): - config.read(path2) - else: - return None - return config - -print "MODULE PATH=%s" % DEFAULT_MODULE_PATH diff --git a/library/command b/library/command index c86b1981c6..b19e15e2e2 100755 --- a/library/command +++ b/library/command @@ -35,6 +35,7 @@ def main(): chdir = module.params['chdir'] args = module.params['args'] + if chdir: os.chdir(chdir)