Fix backward compatibility, storage_type/invetory reclass defaults
Change-Id: I8dee93ffd4441391a5b26ba2c5b46e43357a0ca7
diff --git a/.kitchen.yml b/.kitchen.yml
index 20f4fff..8518d18 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -128,6 +128,11 @@
pillars-from-files:
salt.sls: tests/pillar/master_single_extreclass.sls
+ - name: master-backward-compat
+ provisioner:
+ pillars-from-files:
+ salt.sls: tests/pillar/master_single_extolddays.sls
+
- name: control-default
provisioner:
grains:
diff --git a/salt/files/master.conf b/salt/files/master.conf
index 10ca746..3475762 100644
--- a/salt/files/master.conf
+++ b/salt/files/master.conf
@@ -61,8 +61,8 @@
{%- if master.pillar.engine == 'reclass' or (master.pillar.engine == 'composite' and master.pillar.reclass is defined) %}
reclass: &reclass
- storage_type: {{ master.pillar.get('reclass', {'storage_type': 'yaml_fs'}).storage_type }}
- inventory_base_uri: {{ master.pillar.get('reclass', {'inventory_base_uri': '/srv/salt/reclass'}).inventory_base_uri }}
+ storage_type: {{ master.pillar.get('reclass', {}).get('storage_type', 'yaml_fs') }}
+ inventory_base_uri: {{ master.pillar.get('reclass', {}).get('inventory_base_uri', '/srv/salt/reclass') }}
{# Additional options, for backward compatibility salt:master:pillar might not be defined #}
{%- if master.pillar.reclass is defined %}
{%- if master.pillar.reclass.reclass_source_path is defined %}
diff --git a/tests/pillar/master_single_extolddays.sls b/tests/pillar/master_single_extolddays.sls
new file mode 100644
index 0000000..87c3df7
--- /dev/null
+++ b/tests/pillar/master_single_extolddays.sls
@@ -0,0 +1,28 @@
+git:
+ client:
+ enabled: true
+linux:
+ system:
+ enabled: true
+reclass:
+ storage:
+ enabled: true
+ data_source:
+ engine: git
+ branch: master
+ address: 'https://github.com/salt-formulas/openstack-salt.git'
+salt:
+ master:
+ enabled: true
+ command_timeout: 5
+ worker_threads: 2
+ base_environment: prd
+ #environment:
+ # prd:
+ # formula:
+ # python:
+ # source: git
+ # address: 'https://github.com/salt-formulas/salt-formula-python.git'
+ # revision: master
+ pillar:
+ engine: reclass