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

Prefer plain yaml in salt configs #150

Merged
merged 8 commits into from
Sep 18, 2018

Conversation

joshuathayer
Copy link
Contributor

This builds on @charles-boyd 's #141 , catching it up to changes in master and fixing a small issue.

From #141:

These changes address #130 by removing most of the Jinja2 template syntax from the Salt configs by using qvm.vm instead.

Closes #130

@conorsch
Copy link
Contributor

There are still several commits from #140 / #146 presented here. I'll rebase to remove, since those commits have already landed in master.

@conorsch conorsch force-pushed the 130-prefer-plain-yaml-in-salt-configs branch from 8193204 to c55b8b4 Compare September 17, 2018 22:00
@conorsch
Copy link
Contributor

Rebased. Diff looks clean. Running through the make all && make test flow locally to confirm all tests passing.

@conorsch
Copy link
Contributor

Copy link
Contributor

@conorsch conorsch left a comment

Choose a reason for hiding this comment

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

Updated test report:

  • ✔️ make all passes
  • ✔️ make test passes
  • ✔️ Test submission successfully decrypts and is readable in sd-svs.

See #149 (comment) for details.

@conorsch conorsch merged commit 9125911 into master Sep 18, 2018
@legoktm legoktm deleted the 130-prefer-plain-yaml-in-salt-configs branch May 28, 2024 15:25
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.

Prefer plain YAML in Salt configs
3 participants