Maintain consistent use of tpldir (continues from #211)

[myii]

Continues work done by @mkotsbak in #211 for files added after that PR was merged.

[myii]

What's the situation with using tpldir in .yaml files? I've found that it is in use in the ceph-formula:

• https://github.com/saltstack-formulas/ceph-formula/blob/3ee9a548bae5b76a94d06f47a0fddf53a778cdb4/ceph/osmap.yaml#L1
• https://github.com/saltstack-formulas/ceph-formula/blob/3ee9a548bae5b76a94d06f47a0fddf53a778cdb4/ceph/osfamilymap.yaml#L1
• https://github.com/saltstack-formulas/ceph-formula/blob/3ee9a548bae5b76a94d06f47a0fddf53a778cdb4/ceph/codenamemap.yaml#L1

I've tried it out with the .yaml files in this repo with no apparent backlash. If those changes are viable, I can add them to this PR.

[noelmcloughlin]

The tpldir is just a pattern I saw others using - generally works fine so you could try?

[noelmcloughlin]

I never used salt.file.dirname(tpldir) pattern - maybe it is exact same astmpldir variable?

[myii]

@noelmcloughlin There is a difference between tpldir and salt.file.dirname(tpldir).

https://github.com/saltstack/salt/blob/9c81df64c19e1e25cd9cd2be570d116e2a886604/salt/utils/templates.py#L131:

                tpldir = os.path.dirname(template).replace('\\', '/')

So this returns the directory name where template is located. That works fine for .sls files in the base directory. But what if the .sls file is in a sub-directory, like the ones in this PR? Using tpldir would result in looking for:

• postgres/client/map.jinja
• postgres/dev/map.jinja
• postgres/server/map.jinja

Thus, salt.file.dirname(tpldir) is required when an .sls file is located within a sub-directory. This then references the parent directory appropriately, i.e. postgres/map.jinja.

Other examples from these same sub-directories:

postgres-formula/postgres/client/init.sls

Line 1 in d536482

{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}

postgres-formula/postgres/dev/init.sls

Line 1 in d536482

{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}

postgres-formula/postgres/server/init.sls

Line 1 in d536482

{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}

[myii]

@noelmcloughlin Forgot to mention: thanks for taking the time out to review!

[noelmcloughlin]

Thanks for the hard work and detailed explanation @myii I'll remember this info. LGTM !

[aboe76]

@myii thanks for you work.

[myii]

@aboe76 Thanks for the merge.