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: master.d template to support saltclass ext_pillar config #519

Merged
merged 1 commit into from
Nov 30, 2021

Conversation

rfairburn
Copy link
Contributor

@rfairburn rfairburn commented Nov 2, 2021

PR progress checklist (to be filled in by reviewers)

  • Changes to documentation are appropriate (or tick if not required)
  • Changes to tests are appropriate (or tick if not required)
  • Reviews completed

What type of PR is this?

Primary type

  • [build] Changes related to the build system
  • [chore] Changes to the build process or auxiliary tools and libraries such as documentation generation
  • [ci] Changes to the continuous integration configuration
  • [feat] A new feature
  • [fix] A bug fix
  • [perf] A code change that improves performance
  • [refactor] A code change that neither fixes a bug nor adds a feature
  • [revert] A change used to revert a previous commit
  • [style] Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)

Secondary type

  • [docs] Documentation changes
  • [test] Adding missing or correcting existing tests

Does this PR introduce a BREAKING CHANGE?

No.

Related issues and/or pull requests

#383

Describe the changes you're proposing

This allows for the default external pillar configuration for saltclass to be used. Nested lists did not accept string values previously on child ext_pillar configs.

Pillar / config required to test the proposed changes

The change to the pillar top in the test should cover this

Debug log showing how the proposed changes work

Documentation checklist

  • Updated the README (e.g. Available states).
  • Updated pillar.example.

Testing checklist

  • Included in Kitchen (i.e. under state_top).
  • Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
  • Updated the relevant test pillar.

Additional context

@rfairburn rfairburn requested review from myii and a team as code owners November 2, 2021 14:22
@rfairburn rfairburn force-pushed the fix_ext_pillar branch 4 times, most recently from 52f97f9 to 87e092a Compare November 2, 2021 15:01
@rfairburn rfairburn changed the title Configure master.d template to support default saltclass ext_pillar c… Fix: master.d template to support saltclass ext_pillar config Nov 2, 2021
Copy link
Member

@aboe76 aboe76 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, I don't see any issues with this PR

@rfairburn
Copy link
Contributor Author

@aboe76 @myii Just wanted to check back in. Saw this sitting open for a while yet and didn't know if I needed to do anything else on this or if these normally sit open for a while before merging.

@myii myii merged commit 814092b into saltstack-formulas:master Nov 30, 2021
@myii
Copy link
Member

myii commented Nov 30, 2021

Apologies for the delay, @rfairburn -- this has been merged.

I had to rebase, amend and force-push this PR because all the test suites were merged into one -- you'll see the changeset is a lot more simple now!

Another point to note is that using the master.d Jinja template is no longer the recommended practice with this formula. It will be removed at some point (#417). The whole discussion about this took place in this PR -- I've linked to the comment where we agreed upon using TOFS as the solution for these files.

@saltstack-formulas-travis

🎉 This PR is included in version 1.9.8 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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

Successfully merging this pull request may close these issues.

4 participants