Skip to content
This repository has been archived by the owner on Dec 7, 2022. It is now read-only.

Adds the content app to pulpcore.content #3779

Merged
merged 1 commit into from Dec 13, 2018

Conversation

bmbouter
Copy link
Member

@bmbouter bmbouter commented Nov 30, 2018

The Settings can be a lot simpler now that the architecture no longer
required redirection. It does need to account for the content being
served on a different HOST. This PR handles that.

Since the settings are now single values, they are much easier to
override using Dynaconf, which is great.

The content app can be removed now that the streamer code is handling it
all.

This PR is a prototype and has no docs. Use Pulp as normal , but run the
streamer from github.com/bmbouter/pulp_streamer/ and run the streamer
with:

gunicorn pulpcore.streamer:server --bind localhost:8080 --worker-class aiohttp.GunicornWebWorker -w 2

This PR needs pulp-smash changes from pulp_file so it requires the PR
below:

Required PR: pulp/pulp_file#140

https://pulp.plan.io/issues/4239
closes #4239

@pep8speaks
Copy link

pep8speaks commented Nov 30, 2018

Hello @bmbouter! Thanks for updating the PR.

Comment last updated on December 12, 2018 at 18:04 Hours UTC

bmbouter added a commit to bmbouter/pulpcore-content that referenced this pull request Nov 30, 2018
This is designed to be used with this PR against core:

pulp/pulp#3779
@bmbouter bmbouter force-pushed the replace-content-app-with-streamer branch from dc22dc6 to 5aeba1f Compare November 30, 2018 22:00
bmbouter added a commit to bmbouter/pulpcore-content that referenced this pull request Dec 3, 2018
This is designed to be used with this PR against core:

pulp/pulp#3779
@bmbouter bmbouter force-pushed the replace-content-app-with-streamer branch 7 times, most recently from 1820944 to 40c5390 Compare December 11, 2018 16:50
.travis/install.sh Outdated Show resolved Hide resolved
@bmbouter bmbouter force-pushed the replace-content-app-with-streamer branch 11 times, most recently from 5882498 to c06f6e7 Compare December 12, 2018 19:45
@bmbouter bmbouter changed the title Removes content app and reworks settings Adds the content app to pulpcore.content Dec 12, 2018
@bmbouter bmbouter force-pushed the replace-content-app-with-streamer branch 3 times, most recently from ccce3c8 to bea84e2 Compare December 12, 2018 20:39
@codecov
Copy link

codecov bot commented Dec 12, 2018

Codecov Report

Merging #3779 into master will decrease coverage by 0.64%.
The diff coverage is 3.2%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3779      +/-   ##
==========================================
- Coverage   54.02%   53.37%   -0.65%     
==========================================
  Files          63       64       +1     
  Lines        2758     2739      -19     
==========================================
- Hits         1490     1462      -28     
- Misses       1268     1277       +9
Impacted Files Coverage Δ
pulpcore/app/views/__init__.py 100% <ø> (ø) ⬆️
pulpcore/app/serializers/fields.py 44.64% <0%> (ø) ⬆️
pulpcore/content/handler.py 0% <0%> (ø)
pulpcore/content/__init__.py 0% <0%> (ø)
pulpcore/app/urls.py 91.93% <100%> (ø) ⬆️
pulpcore/app/models/repository.py 55.17% <100%> (ø) ⬆️
pulpcore/app/settings.py 97.72% <100%> (+0.05%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9713e27...8219efd. Read the comment docs.

@bmbouter
Copy link
Member Author

FYI since this PR removes the apache and nginx file serving integration I'm making another issue to bring that back. I'll post a link to that other issue here today. We can prioritize that together and I'm happy to bring it back immediately in another PR if that is what we should do. I'll link to the issue when I make it.

@jortel
Copy link
Contributor

jortel commented Dec 13, 2018

LGTM
Please squash before merging. Looks like @dkliban has requested changes so perhaps he should approve when satisfied.

The Settings can be a lot simpler now that the architecture no longer
required redirection. It does need to account for the content being
served on a different HOST. This PR handles that.

Since the settings are now single values, they are much easier to
override using Dynaconf, which is great.

The content app can be removed now that the streamer code is handling it
all.

This PR is a prototype and has no docs. Use Pulp as normal , but run the
streamer from github.com/bmbouter/pulp_streamer/ and run the streamer
with:

`gunicorn pulpcore.streamer:server --bind localhost:8080 --worker-class aiohttp.GunicornWebWorker -w 2`

This PR needs pulp-smash changes from pulp_file so it requires the PR
below:

Required PR: pulp/pulp_file#140

https://pulp.plan.io/issues/4239
closes #4239

https://pulp.plan.io/issues/3698
closes pulp#3698

https://pulp.plan.io/issues/3699
closes pulp#3699

https://pulp.plan.io/issues/4181
closes #4181

https://pulp.plan.io/issues/4243
closes #4243
@bmbouter bmbouter force-pushed the replace-content-app-with-streamer branch from b5c8d37 to 8219efd Compare December 13, 2018 17:19
Copy link
Member

@dkliban dkliban left a comment

Choose a reason for hiding this comment

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

Thank you!

@bmbouter bmbouter merged commit a3aaa5e into pulp:master Dec 13, 2018
@bmbouter bmbouter deleted the replace-content-app-with-streamer branch December 13, 2018 17:59
@dralley
Copy link
Contributor

dralley commented Dec 14, 2018

@bmbouter The Travis config changes in this PR need to be copied over to plugins and the plugin template, since without the content app or the streamer, the "download content" tests fail.

@dralley
Copy link
Contributor

dralley commented Dec 14, 2018

Also our docs on how to run Pulp, both the hosted docs and the plugin docs e.g. https://github.com/pulp/pulp_file/#run-services. Since PRs need to be made against the plugins anyway it would be good to fix that at the same time.

@bmbouter
Copy link
Member Author

@dralley I'm working on fixing Travis for the plugins and after that I'm fixing the docs. Hopefully all will get done today.

bmbouter pushed a commit to bmbouter/pulp_gem that referenced this pull request Dec 14, 2018
This updates Travis to continue to pass given the breaking change
merged to core with this PR: pulp/pulp#3779
bmbouter pushed a commit to bmbouter/pulp_cookbook that referenced this pull request Dec 14, 2018
This updates Travis to continue to pass given the breaking change
merged to core with this PR: pulp/pulp#3779
bmbouter pushed a commit to bmbouter/pulp_cookbook that referenced this pull request Dec 14, 2018
This updates Travis to continue to pass given the breaking change
merged to core with this PR: pulp/pulp#3779
gmbnomis pushed a commit to pulp/pulp_cookbook that referenced this pull request Dec 15, 2018
This updates Travis to continue to pass given the breaking change
merged to core with this PR: pulp/pulp#3779
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
5 participants