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: avoid setting multiple pre-start stanzas in upstart #239

Conversation

solarchad
Copy link
Contributor

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

#238

Describe the changes you're proposing

This fixes a bug introduced in #238.

According to the upstart init manpages:

If a stanza is duplicated, the last occurence will be used.

So if someone has set both vars pull_before_start and remove_before_start to true, then there could be two pre-start script stanzas, of which upstart would only accept the last one, which isn't ideal behavior.

This change groups both scripts to run under one pre-start script stanza.

Pillar / config required to test the proposed changes

N/A

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

@solarchad solarchad requested a review from myii January 22, 2020 16:11
@myii myii merged commit 13c1c20 into saltstack-formulas:master Jan 22, 2020
@myii
Copy link
Member

myii commented Jan 22, 2020

Merged, thanks for the quick fix, @solarchad.

@solarchad solarchad deleted the support-rm-container-prestart-upstart-fix branch January 22, 2020 16:16
@saltstack-formulas-travis

🎉 This PR is included in version 0.43.1 🎉

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.

3 participants