Revert "Update reclass cli entry points, use the logger from reclass.logger"
This reverts commit 67bde40603a51daddffad3e62b5143d97e0c376a, which
introduces two problems:
First, the Salt adapter's logger import is wrong
Second, it instantiates the command-line parser with reclass defaults,
not with defaults of the adapters, so that the Salt adapter e.g.
doesn't take --top anymore.
diff --git a/reclass/adapters/ansible.py b/reclass/adapters/ansible.py
index ac261e7..cbf5f17 100755
--- a/reclass/adapters/ansible.py
+++ b/reclass/adapters/ansible.py
@@ -19,7 +19,6 @@
from reclass.config import find_and_read_configfile, get_options
from reclass.version import *
from reclass.constants import MODE_NODEINFO
-from reclass.logs import logger
def cli():
try:
@@ -54,7 +53,6 @@
nodeinfo_help='output host_vars for the given host',
add_options_cb=add_ansible_options_group,
defaults=defaults)
- logger.debug('parsed options: %s' % options)
storage = get_storage(options.storage_type, options.nodes_uri,
options.classes_uri)
diff --git a/reclass/adapters/salt.py b/reclass/adapters/salt.py
index b926feb..1b45823 100755
--- a/reclass/adapters/salt.py
+++ b/reclass/adapters/salt.py
@@ -16,10 +16,8 @@
path_mangler
from reclass.constants import MODE_NODEINFO
from reclass.defaults import *
-from reclass.logger import logger
from reclass.version import *
-
def ext_pillar(minion_id, pillar,
storage_type=OPT_STORAGE_TYPE,
inventory_base_uri=OPT_INVENTORY_BASE_URI,
@@ -96,7 +94,6 @@
nodeinfo_dest='nodename',
nodeinfo_help='output pillar data for a specific node',
defaults=defaults)
- logger.debug('parsed options: %s' % options)
class_mappings = defaults.get('class_mappings')
if options.mode == MODE_NODEINFO:
diff --git a/reclass/cli.py b/reclass/cli.py
index df314e8..c3a11a0 100644
--- a/reclass/cli.py
+++ b/reclass/cli.py
@@ -16,9 +16,10 @@
from reclass.errors import ReclassException
from reclass.defaults import *
from reclass.constants import MODE_NODEINFO
-from reclass.logs import logger
from reclass.version import *
+logger = logging.getLogger(RECLASS_NAME)
+
def main():
try: