Fix, system.repo don't use curl on fixed pkgrepo.manage #155
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Change-Id: Id5b5a44f3dfbbdd60442fd2f273b72557fa9e191
bbinet
reviewed
Jun 12, 2018
| {%- if repo.key_server is defined %} | ||
| - keyserver: {{ repo.key_server }} | ||
| {%- endif %} | ||
| {%- if repo.key_url is defined and grains['saltversioninfo'] >= [2017, 7] %} |
There was a problem hiding this comment.
or repo.key_url.startswith('salt://')
There was a problem hiding this comment.
I mean:
{%- if repo.key_url is defined and (grains['saltversioninfo'] >= [2017, 7] or repo.key_url.startswith('salt://')) %}
There was a problem hiding this comment.
well, you are right, can you send one more PR (I will merge it on GH while traveling home)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change-Id: Id5b5a44f3dfbbdd60442fd2f273b72557fa9e191
(change will come from Mirantis gerrit once it pass tests)