Skip to content

Fix Barbican templating #1045

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

Merged
merged 1 commit into from
Apr 29, 2024
Merged

Fix Barbican templating #1045

merged 1 commit into from
Apr 29, 2024

Conversation

Alex-Welsh
Copy link
Member

The existing template removes the newline after {% endraw%}, so the two config options get stacked onto the same line, breaking Barbican

@Alex-Welsh Alex-Welsh requested a review from a team as a code owner April 23, 2024 14:42
Copy link
Contributor

@markgoddard markgoddard left a comment

Choose a reason for hiding this comment

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

Should it go to yoga first?

@Alex-Welsh
Copy link
Member Author

Should it go to yoga first?

@MoteHue Suggested that it could be to do with the config merging in Antelope. If you think it would affect yoga as well, then I'll rebase

@MoteHue
Copy link
Contributor

MoteHue commented Apr 25, 2024

Should it go to yoga first?

@MoteHue Suggested that it could be to do with the config merging in Antelope. If you think it would affect yoga as well, then I'll rebase

This isn't due to the config merging, it's just how {% raw %} tags work. The similar "bug" I've seen is that defining an option within an environment and a base config file will cause the lines to be duplicated.

Personally, I'd change this to the following because it's not immediately obvious that we'd need to keep that newline hanging around.

{% raw %}
ssl_ca_crt_file = {{ openstack_cacert }}
{% endraw %}

Might be able to do something with symbols in the tags too?
{% endraw +%} perhaps?

@Alex-Welsh Alex-Welsh changed the base branch from stackhpc/2023.1 to stackhpc/yoga April 29, 2024 08:51
@Alex-Welsh
Copy link
Member Author

I've Yoga'd it and moved around the tags

@markgoddard markgoddard merged commit 284e431 into stackhpc/yoga Apr 29, 2024
@markgoddard markgoddard deleted the barbican-template branch April 29, 2024 11:21
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.

3 participants