Skip to content
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

Ref #10040 - Minor fixes for the ostree repo create code #5448

Merged
merged 1 commit into from Sep 1, 2015

Conversation

Projects
None yet
4 participants
@parthaa
Copy link
Member

commented Aug 28, 2015

  1. Added the missing auto_publish : true setting for OSTree repo
    creation
  2. Removed the nodes distributor for ostree since we are changing that
    mechanism to a different model. (Nodes distributor is also not supported
    for ostree content.)
@jlsherrill

View changes

app/lib/actions/katello/repository/capsule_generate_and_sync.rb Outdated
@@ -7,7 +7,7 @@ def humanized_name
end

def plan(repo)
if repo.node_syncable?
if repo.node_syncable? && !repo.ostree?

This comment has been minimized.

Copy link
@jlsherrill

jlsherrill Aug 28, 2015

Member

why not just put that condition in the node_syncable? method

This comment has been minimized.

Copy link
@parthaa

parthaa Aug 28, 2015

Author Member

good suggestion

@parthaa parthaa force-pushed the parthaa:crud-changes branch Aug 28, 2015

@jlsherrill

View changes

app/lib/actions/katello/content_view/node_metadata_generate.rb Outdated
@@ -15,7 +15,7 @@ def plan(content_view, environment)

concurrence do
::Katello::Repository.in_content_views([content_view]).in_environment(environment).each do |repo|
plan_action(Katello::Repository::NodeMetadataGenerate, repo)
plan_action(Katello::Repository::NodeMetadataGenerate, repo) unless repo.ostree?

This comment has been minimized.

Copy link
@jlsherrill

jlsherrill Aug 28, 2015

Member

can you change this to node_syncable?

@parthaa parthaa force-pushed the parthaa:crud-changes branch Aug 28, 2015

@@ -446,7 +446,7 @@ def related_resources
end

def node_syncable?
environment && !(environment.library? && content_view.default? && puppet?) && !file?
environment && !(environment.library? && content_view.default? && puppet?) && !file? && !ostree?

This comment has been minimized.

Copy link
@daviddavis

daviddavis Sep 1, 2015

Member

Would prefer to see a test for this.

This comment has been minimized.

Copy link
@parthaa

parthaa Sep 1, 2015

Author Member

Updated

@daviddavis

This comment has been minimized.

Copy link
Member

commented Sep 1, 2015

One small comment. Other than that, LGTM.

Ref #10040 - Minor fixes for the ostree repo create code
1) Added the missing auto_publish : true setting for OSTree repo
creation
2) Removed the nodes distributor for ostree since we are changing that
mechanism to a different model. (Nodes distributor is also not supported
for ostree content.)
@daviddavis

This comment has been minimized.

Copy link
Member

commented Sep 1, 2015

👍 APJ.

parthaa added a commit that referenced this pull request Sep 1, 2015

Merge pull request #5448 from parthaa/crud-changes
Ref #10040 - Minor fixes for the ostree repo create code

@parthaa parthaa merged commit 6229d47 into Katello:ostree Sep 1, 2015

1 check passed

default Job result: SUCCESS
Details

@parthaa parthaa deleted the parthaa:crud-changes branch Sep 1, 2015

parthaa added a commit to parthaa/katello that referenced this pull request Feb 12, 2016

Fixes #13585 - Adding Ostree functionality
Changes include

Fixes #10042 - Enable ostree repos in the CDN -
Katello#5455

Fixes #11611 - Copy over ostree branches on publish and promote -
Katello#5449

Ref #10040 - Minor fixes for the ostree repo create code -
Katello#5448

1) Added the missing auto_publish : true setting for OSTree repo
creation
2) Removed the nodes distributor for ostree since we are changing that
mechanism to a different model. (Nodes distributor is also not supported
for ostree content.)

Fixes #10066 - Support promoting ostree repos -
Katello#5447

Refs #10040 - Ostree branch change now updates pulp -
Katello#5431

Fixes #10063 - Allow publishing of ostree repos in content views -
Katello#5415

Fixes #11567 - Fix relative_path for ostree repos -
Katello#5442

Fixes #10040 - UI Bindings to CRUD rpm-ostree -
Katello#5394
Includes adding/updating/removing  branches

Fixes #10044 - UI to remove/add ostree repos to CVs -
Katello#5361
Fixes #10056 - Adding ostree sync -
Katello#5306
Refs #10062 - Allow users to add/remove ostree repos
-Katello#5337

Refs #10055 - Initial model bindings for OSTREE CRUD -
Katello#5240
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.