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

Added defaultzonepath to template name.conf.erb #217

Merged
merged 21 commits into from
Sep 21, 2022

Conversation

benjamin-robertson
Copy link
Contributor

@benjamin-robertson benjamin-robertson commented Sep 7, 2022

Fixes issue #216

Closes #216

Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

I think this is correct. Prior to this it was only used when views were enabled (

<% if @include_defaultzones -%>
<% if scope.lookupvar("::dns::defaultzonepath") != 'unmanaged' -%>
include "<%= scope.lookupvar('::dns::defaultzonepath') %>";
<% end -%>
<% end -%>
) but this is in a section where views aren't enabled.

I started the test suite.

@ekohl
Copy link
Member

ekohl commented Sep 7, 2022

Could you address the test failures?

spec/classes/dns_init_spec.rb Outdated Show resolved Hide resolved
spec/classes/dns_init_spec.rb Outdated Show resolved Hide resolved
@benjamin-robertson
Copy link
Contributor Author

@ekohl Tests should be passing now if you want to kick them off again in this repo. Thanks Ben

Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

Thanks!

@@ -140,9 +147,11 @@
" include \"#{options_path}\";",
'};',
"include \"#{localzonepath}\";",
defaultzonepath ? "include \"#{defaultzonepath}\";" : nil,
Copy link
Member

Choose a reason for hiding this comment

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

I like this solution more than what was used for localzonepath.

@ekohl ekohl merged commit 3e6a93c into theforeman:master Sep 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

defaultzonepath parameter defined, but not used in template name.conf.erb
3 participants