fixes #20089 - Remove deleted puppet modules #6843
Merged
Conversation
This file contains 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
|
Issues: #20089 |
houndci-bot
reviewed
Jun 29, 2017
app/models/katello/glue/pulp/repo.rb
Outdated
| @@ -207,6 +207,14 @@ def yum_importer_values(capsule) | |||
| config.merge(importer_ssl_options(capsule)) | |||
| end | |||
|
|
|||
| def puppet_importer_values(capsule) | |||
| config = { | |||
| :feed => self.importer_feed_url(capsule), | |||
There was a problem hiding this comment.
Use 2 spaces for indentation in a hash, relative to the start of the line where the left curly brace is.
sjha4
force-pushed
the
issue20089
branch
3 times, most recently
from
a32150f
to
7447302
Compare
|
[test] |
sjha4
changed the title
|
@jlsherrill : Thanks! Test Cases Passed 👍 |
sjha4
changed the title
sjha4
changed the title
jlsherrill
reviewed
Jul 11, 2017
app/models/katello/glue/pulp/repo.rb
Outdated
| @@ -157,8 +157,8 @@ def generate_importer(capsule = SmartProxy.default_capsule!) | |||
| when Repository::FILE_TYPE | |||
| Runcible::Models::IsoImporter.new(importer_ssl_options(capsule).merge(:feed => importer_feed_url(capsule))) | |||
| when Repository::PUPPET_TYPE | |||
| options = {:feed => importer_feed_url(capsule)} | |||
| Runcible::Models::PuppetImporter.new(importer_ssl_options(capsule).merge(options)) | |||
| #options = {:feed => importer_feed_url(capsule)} | |||
There was a problem hiding this comment.
I think you meant to delete this line?
jlsherrill
reviewed
Jul 11, 2017
| @@ -125,7 +125,7 @@ <h6 translate> | |||
| </p> | |||
| </div> | |||
|
|
|||
| <div class="checkbox" ng-show="repository.content_type === 'yum'"> | |||
| <div class="checkbox" ng-show="repository.content_type === 'yum'|| repository.content_type === 'puppet'"> | |||
There was a problem hiding this comment.
add a space between the word 'yum' and || please :)
|
minor issues and nitpicks, but otherwise seems to work fine! |
|
[test] |
|
ACK thanks @sjha4 !! |
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.
Steps to reproduce:
Changes to fix:
Using remove_missing flag on the pulp end to clone behavior as is on the yum repos.