Merge "Optimize kitchen tests for Travis CI"
diff --git a/_modules/reclass.py b/_modules/reclass.py
index f15eb44..3c06da1 100644
--- a/_modules/reclass.py
+++ b/_modules/reclass.py
@@ -66,6 +66,7 @@
# read classes
for class_name, params in classes.items():
+ LOG.debug("Processing:{}".format(params['file']))
with open(params['file'], 'r') as f:
# read raw data
raw = f.read()
@@ -563,33 +564,33 @@
node = node_get(name=name)
if node.has_key('Error'):
return {'Error': 'Error in retrieving node'}
-
+
for name, values in node.items():
param = values.get('parameters', {})
path = values.get('path')
cluster = values.get('cluster')
environment = values.get('environment')
write_class = values.get('classes', [])
-
+
if parameters:
param.update(parameters)
-
+
if classes:
for classe in classes:
if not classe in write_class:
write_class.append(classe)
-
+
node_meta = _get_node_meta(name, cluster, environment, write_class, param)
LOG.debug(node_meta)
-
+
if path == None:
file_path = os.path.join(_get_nodes_dir(), name + '.yml')
else:
file_path = os.path.join(_get_nodes_dir(), path, name + '.yml')
-
+
with open(file_path, 'w') as node_file:
node_file.write(yaml.safe_dump(node_meta, default_flow_style=False))
-
+
return node_get(name)
diff --git a/debian/control b/debian/control
index fa8f62a..3854a05 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,6 @@
Package: salt-formula-reclass
Architecture: all
-Depends: ${misc:Depends}, salt-master, reclass
+Depends: ${misc:Depends}, salt-master
Description: Reclass salt formula
Configure Reclass hierarchical data storage.
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 3f42101..9451611 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -110,7 +110,7 @@
}
salt_run() {
- [ -e ${VEN_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
+ [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
salt-call ${SALT_OPTS} $*
}