Merge "Fix reference to the nodes_uri param"
diff --git a/.kitchen.yml b/.kitchen.yml
index d1fff6e..3f2cfaa 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -56,4 +56,10 @@
provisioner:
pillars-from-files:
reclass.sls: tests/pillar/storage_local.sls
+
+ - name: storage_nodes_uri
+ provisioner:
+ pillars-from-files:
+ reclass.sls: tests/pillar/storage_nodes_uri.sls
+
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/metadata/service/storage/salt.yml b/metadata/service/storage/salt.yml
index 7f18493..a597727 100644
--- a/metadata/service/storage/salt.yml
+++ b/metadata/service/storage/salt.yml
@@ -7,7 +7,6 @@
storage:
enabled: true
base_dir: /srv/salt/reclass
- nodes_uri:
output: yaml
data_source:
engine: git
diff --git a/reclass/files/reclass-config.yml b/reclass/files/reclass-config.yml
index 9314923..26ff0e2 100644
--- a/reclass/files/reclass-config.yml
+++ b/reclass/files/reclass-config.yml
@@ -4,7 +4,7 @@
output: {{ storage.get('output', 'json') }}
inventory_base_uri: {{ storage.base_dir }}
{%- if storage.nodes_uri is defined %}
-nodes_uri: {{ nodes_uri }}
+nodes_uri: {{ storage.nodes_uri }}
{%- endif %}
{%- if storage.class_mappings is defined %}
class_mappings:
diff --git a/tests/pillar/storage_nodes_uri.sls b/tests/pillar/storage_nodes_uri.sls
new file mode 100644
index 0000000..dc461fd
--- /dev/null
+++ b/tests/pillar/storage_nodes_uri.sls
@@ -0,0 +1,7 @@
+reclass:
+ storage:
+ enabled: true
+ base_dir: /srv/reclass
+ nodes_uri: /srv/reclass/foo/nodes
+ data_source:
+ engine: local