-
Notifications
You must be signed in to change notification settings - Fork 134
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
Option to specify an absolute salt:// path for config_files #57
Conversation
yamllint raises an error
not sure how to solve it. And Debian 10 fails on verify, I imagine this is the same |
pillar.example
Outdated
source: templates/relay-rabbitmq.config | ||
rabbitmq.conf: | ||
# source is relative to `rabbitmq` formula | ||
# source: templates/rabbitmq.conf |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comments-indentation
error usually requires the indentation of the comment character to be in line with the line below, so in this case:
# source: templates/rabbitmq.conf | |
# source: templates/rabbitmq.conf |
@daks That commit has already been added to this formula. Actually, there's failures during the verification: × rabbitmq configuration: should match desired lines (3 failed)
× File /etc/rabbitmq/rabbitmq.conf is expected to exist
expected File /etc/rabbitmq/rabbitmq.conf to exist
× File /etc/rabbitmq/rabbitmq.conf is expected to be file
expected `File /etc/rabbitmq/rabbitmq.conf.file?` to return true, got false
× File /etc/rabbitmq/rabbitmq.conf content is expected to include "# Config file for rabbitmq"
expected nil to include "# Config file for rabbitmq", but it does not respond to `include?` |
{%- if source.startswith('salt://') %} | ||
- source: {{ source }} | ||
{%- else %} | ||
- source: salt://{{ slspath }}/{{ source }} | ||
{% endif %} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we squash this into a one-liner?
@daks Rather than have this as a separate state (i.e. in Kitchen), shouldn't rabbitmq-formula/rabbitmq/install.sls Lines 3 to 9 in e97c976
Or does it have any relationship to |
I don't know. I wanted a minimal PR with no possible influence on existing behaviour. I prefer to let this refactoring (with breaking change) to a future PR |
848ae4f
to
d3ce57c
Compare
@daks Thanks, I've merged this after our conversation in Slack. Going forward, |
🎉 This PR is included in version 0.18.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
thanks |
PR progress checklist (to be filled in by reviewers)
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 testsDoes this PR introduce a
BREAKING CHANGE
?No.
Related issues and/or pull requests
This solves #56
Describe the changes you're proposing
The proposed changes lets you define a config file, using
config_files
pillar in two ways:slspath
salt://
fileserver. Just prefix it withsalt://
to use this onePillar / config required to test the proposed changes
Please see
pillar.example
which is used for the additional test.Debug log showing how the proposed changes work
Documentation checklist
README
(e.g.Available states
).pillar.example
.Testing checklist
state_top
).Additional context