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.

Sign up for GitHub

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

fix libvirt template typos #247

Merged
merged 1 commit into from
May 8, 2016
Merged

fix libvirt template typos #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix libvirt template typos
  • Loading branch information
@mmoll
mmoll committed May 6, 2016
commit 07e326e3406cc15baa41b39cd8b7940298c69582
2 changes: 1 addition & 1 deletion templates/dhcp.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# valid providers:
# - <%= "dhcp_" %>isc (ISC dhcp server)
# - <%= "dhcp_" %>native_ms (Microsoft native implementation)
# - <%= "dhcp_" %><% scope.lookupvar("foreman_proxy::libvirt_backend") %> (dnsmasq via libvirt)
# - <%= "dhcp_" %><%= scope.lookupvar("foreman_proxy::libvirt_backend") %> (dnsmasq via libvirt)
:use_provider: dhcp_<%= scope.lookupvar("foreman_proxy::dhcp_provider") %>
:server: <%= scope.lookupvar("foreman_proxy::dhcp_server") %>
# subnets restricts the subnets queried to a subset, to reduce the query time.
Expand Down
2 changes: 1 addition & 1 deletion templates/dns.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# <%= "dns_" %>dnscmd (Microsoft Windows native implementation)
# <%= "dns_" %>nsupdate
# <%= "dns_" %>nsupdate_gss (for GSS-TSIG support)
# <%= "dns_" %><% scope.lookupvar("foreman_proxy::libvirt_backend") %> (dnsmasq via libvirt)
# <%= "dns_" %><%= scope.lookupvar("foreman_proxy::libvirt_backend") %> (dnsmasq via libvirt)
:use_provider: dns_<%= scope.lookupvar("foreman_proxy::dns_provider") %>
# use this setting if you want to override default TTL setting (86400)
:dns_ttl: <%= scope.lookupvar("foreman_proxy::dns_ttl") %>
2 changes: 0 additions & 2 deletions templates/settings.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,10 @@
# default values for https_port is 8443
<%= '#' unless ssl -%>:https_port: <%= scope.lookupvar("foreman_proxy::ssl_port") %>
<%= '#' unless http -%>:http_port: <%= scope.lookupvar("foreman_proxy::http_port") %>

<%- if scope.lookupvar('foreman_proxy::libvirt_backend') == 'virsh' -%>
# shared options for virsh DNS/DHCP provider
:virsh_network: <%= scope.lookupvar('foreman_proxy::libvirt_network') %>
<%- end -%>

# Log configuration
# Uncomment and modify if you want to change the location of the log file or use STDOUT or SYSLOG values
:log_file: <%= scope.lookupvar("foreman_proxy::log") %>
Expand Down