Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update reclass to release v1.5.6 #146

Merged
merged 1 commit into from Sep 19, 2018
Merged

update reclass to release v1.5.6 #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion kapitan/reclass
Open in desktop
Submodule reclass updated 41 files
+3 −2 .travis.yml
+1 −0 Pipfile
+32 −1 README-extentions.rst
+14 −0 doc/source/changelog.rst
+2 −2 reclass/__init__.py
+4 −1 reclass/adapters/ansible.py
+5 −3 reclass/adapters/salt.py
+4 −1 reclass/cli.py
+3 −0 reclass/config.py
+4 −4 reclass/core.py
+2 −2 reclass/datatypes/applications.py
+1 −8 reclass/datatypes/classes.py
+19 −35 reclass/datatypes/entity.py
+49 −53 reclass/datatypes/parameters.py
+10 −5 reclass/datatypes/tests/test_exports.py
+1 −0 reclass/defaults.py
+7 −0 reclass/errors.py
+3 −1 reclass/settings.py
+11 −0 reclass/storage/common.py
+6 −2 reclass/storage/yaml_fs/__init__.py
+9 −1 reclass/storage/yaml_git/__init__.py
+1 −1 reclass/tests/test_core.py
+12 −21 reclass/utils/dictpath.py
+1 −1 reclass/values/__init__.py
+11 −44 reclass/values/compitem.py
+3 −22 reclass/values/dictitem.py
+125 −228 reclass/values/invitem.py
+52 −16 reclass/values/item.py
+8 −27 reclass/values/listitem.py
+78 −20 reclass/values/parser_funcs.py
+13 −45 reclass/values/refitem.py
+11 −16 reclass/values/scaitem.py
+0 −7 reclass/values/tests/__init__.py
+132 −0 reclass/values/tests/test_compitem.py
+8 −10 reclass/values/tests/test_value.py
+18 −20 reclass/values/value.py
+25 −29 reclass/values/valuelist.py
+1 −1 reclass/version.py
+1 −1 requirements.txt
+1 −1 setup.py
+6 −0 test/model/default/classes/third.yml
9 changes: 6 additions & 3 deletions kapitan/resources.py
View file
Open in desktop
Expand Up @@ -199,7 +199,8 @@ def inventory_reclass(inventory_path):
reclass_config = {'storage_type': 'yaml_fs',
'inventory_base_uri': inventory_path,
'nodes_uri': os.path.join(inventory_path, 'targets'),
'classes_uri': os.path.join(inventory_path, 'classes')
'classes_uri': os.path.join(inventory_path, 'classes'),
'compose_node_name': False
}

try:
Expand All @@ -219,8 +220,10 @@ def inventory_reclass(inventory_path):
logger.debug("Using reclass inventory config defaults")

try:
storage = reclass.get_storage(reclass_config['storage_type'], reclass_config['nodes_uri'],
reclass_config['classes_uri'])
storage = reclass.get_storage(reclass_config['storage_type'],
reclass_config['nodes_uri'],
reclass_config['classes_uri'],
reclass_config['compose_node_name'])
class_mappings = reclass_config.get('class_mappings') # this defaults to None (disabled)
_reclass = reclass.core.Core(storage, class_mappings, reclass.settings.Settings())

Expand Down