Fixes #3971 - warning shown when PXE template is edited and has hosts in build mode #2501
Conversation
domcleal
changed the title
|
My preference would be to add a feature to rewrite the templates, either automatically or otherwise, rather than put the onus entirely on the user. Any thoughts about that? We have http://projects.theforeman.org/issues/2267 and related tracking this. |
| @@ -67,6 +67,11 @@ def permitted_actions(template) | |||
| end | |||
| end | |||
|
|
|||
| def pxe_with_building_hosts?(template) | |||
| kinds = ["PXELinux", "PXEGrub", "iPXE"] | |||
| template.operatingsystems.map(&:hosts).flatten.any?(&:build) && !template.template_kind.nil? && kinds.include?(template.template_kind.name) | |||
There was a problem hiding this comment.
We should check the performance of this host lookup query to check it's not performing a huge number of SQL queries. We should probably also use where(:build => true) to filter in the database.
xprazak2
force-pushed
the
template-warning
branch
from
f6f529b
to
f9d9c9b
Compare
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
|
I made changes according to comments, I also added a feature that can rewrite the templates: |
| def pxe_with_building_hosts?(template) | ||
| kinds = ["PXELinux", "PXEGrub"] | ||
| os_ids = template.operatingsystem_ids | ||
| !template.template_kind.nil? && kinds.include?(template.template_kind.name) && Host.where(:build => true, :operatingsystem_id => os_ids).count > 0 |
There was a problem hiding this comment.
Note that using template_kind is triggering test failures as it only exists in ProvisioningTemplate, not Ptable.
|
I don't see any code that triggers regeneration. Have you pushed properly? Also, tests failed. |
|
See the linked PR, #2508. |
xprazak2
force-pushed
the
template-warning
branch
from
f9d9c9b
to
4c4ba29
Compare
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
| kinds = ["PXELinux", "PXEGrub"] | ||
| os_ids = template.operatingsystem_ids | ||
| template.respond_to?(:template_kind) && | ||
| !template.template_kind.nil? && |
There was a problem hiding this comment.
Nitpick, template.template_kind.present? rather than the negation, or even combine it with the line above and do template.try(:template_kind).present? which'll work when it doesn't respond to.
… has hosts in build mode
xprazak2
force-pushed
the
template-warning
branch
from
4c4ba29
to
3be2779
Compare
|
[test] |
Warning shown when PXE template is edited and has hosts in build mode