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

Refs #25590 - Correct httpboot template #495

Merged
merged 1 commit into from Mar 11, 2019

Conversation

ekohl
Copy link
Member

@ekohl ekohl commented Mar 11, 2019

No description provided.

@@ -352,7 +352,7 @@
it 'should generate correct httpboot.yml' do
verify_exact_contents(catalogue, "#{etc_dir}/foreman-proxy/settings.d/httpboot.yml", [
'---',
':enabled: both',
':enabled: true',
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this also be changed in params.pp?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, we have a type that forces it to be http, https or both. This is then mixed in the settings file to determine the actual value:

if $module {
if $enabled {
$module_enabled = $listen_on ? {
'both' => true,
'https' => 'https',
'http' => 'http',
default => false,
}
if $feature {
foreman_proxy::feature { $feature: }
}
} else {
$module_enabled = false
}
}

Note foreman_proxy::feature as well. That creates a marker that verifies whether a feature is enabled on the foreman side after registration.

Copy link
Member

@tbrisker tbrisker left a comment

Choose a reason for hiding this comment

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

Thanks @ekohl !

@ekohl ekohl merged commit b5091b4 into theforeman:master Mar 11, 2019
@ekohl ekohl added the Bug label Mar 13, 2019
@ekohl ekohl deleted the 25590-httpboot-fix branch March 13, 2019 15:31
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.

None yet

3 participants