summaryrefslogtreecommitdiffstats
path: root/ipalib/cli.py
diff options
context:
space:
mode:
Diffstat (limited to 'ipalib/cli.py')
-rw-r--r--ipalib/cli.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py
index 1a08cef41..d66e1e2eb 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -29,8 +29,7 @@ import frontend
import errors
import plugable
import ipa_types
-
-from ipalib import config
+import config
def exit_error(error):
sys.exit('ipa: ERROR: %s' % error)
@@ -257,9 +256,7 @@ class CLI(object):
self.print_commands()
print 'Usage: ipa COMMAND'
sys.exit(2)
- # do parsing here, read the conf
- conf_dict = config.read_config(self.api.env.conf)
- self.api.env.update(conf_dict)
+ self.api.env.update(config.generate_env())
key = sys.argv[1]
if key not in self:
self.print_commands()