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.

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

fix(tofs): use literal pillar (config) paths instead of tpldir #22

Merged
merged 1 commit into from
Feb 25, 2019

Conversation

myii
Copy link
Member

@myii myii commented Feb 25, 2019

  • With nested .sls files, tpldir respectively resolves to:
    • systemd/networkd
    • systemd/resolved
    • systemd/timesyncd
  • Without this fix, only the default value provided is ever used, respectively:
    • ['network']
    • ['resolved.conf']
    • ['timesyncd.conf']

@aboe76 In my defense, I did voice my concerns about #17 being merged too quickly without full testing. In any case, this isn't a substantial bug since all it prevents is the extra configurability which no-one is using right now.

I've gone for this simplest fix but I really am considering whether we should use topdir in place of tpldir instead. What's your take on that?

* With nested `.sls` files, `tpldir` respectively resolves to:
  - `systemd/networkd`
  - `systemd/resolved`
  - `systemd/timesyncd`
* Without this fix, only the default value provided is ever used, respectively:
  - `['network']`
  - `['resolved.conf']`
  - `['timesyncd.conf']`
@myii myii requested a review from aboe76 February 25, 2019 13:19
myii added a commit to myii/template-formula that referenced this pull request Feb 25, 2019
* With nested `.sls` files, `tpldir` respectively resolves to:
  - `template/<subdir>`
* Without this fix, only the default value provided is ever used, respectively:
  - `['example.tmpl', 'example.tmpl.jinja']`
* Follows-on from saltstack-formulas/systemd-formula#22
@myii
Copy link
Member Author

myii commented Feb 25, 2019

myii added a commit to myii/stack-formula that referenced this pull request Feb 25, 2019
* With nested `.sls` files, `tpldir` respectively resolves to:
  - `stack/<subdir>`
* Without this fix, only the default value provided is ever used, respectively:
  - `stack-config`:      ['sdb.conf']
  - `stack-keys-config`: ['sdb_keys.conf']
* Follows-on from:
  - saltstack-formulas/systemd-formula#22
  - saltstack-formulas/template-formula#49
@aboe76 aboe76 merged commit c048ada into saltstack-formulas:master Feb 25, 2019
@myii myii deleted the bug/fix-files-switch-calls branch February 25, 2019 21:16
@aboe76
Copy link
Member

aboe76 commented Feb 25, 2019

@myii you are right about this, but let's see if template-formula works, we have some more formula's with tofs pattern awaiting...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants