Fix nil access in kickstart_networking_setup

This change fixes issues that might occur when trying to generate kickstart provisioning scripts on hosts without subnets specified.
theforeman · Feb 13, 2017 · 461c1fe · 461c1fe
1 parent 8710854
commit 461c1fe
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/snippets/kickstart_networking_setup.erb b/snippets/kickstart_networking_setup.erb
@@ -20,14 +20,14 @@ BOOTPROTO="<%= dhcp ? 'dhcp' : 'none' -%>"
 <% unless dhcp -%>
 IPADDR="<%= @host.ip -%>"
 NETMASK="<%= subnet.mask -%>"
-<% if subnet.gateway.present? -%>
+<% if subnet && subnet.gateway.present? -%>
 GATEWAY="<%= subnet.gateway %>"
 <% end -%>
 <% if @host.ip6.present? -%>
 IPV6INIT=yes
 IPV6_AUTOCONF=no
 IPV6ADDR=<%= @host.ip6 %>
-<% if subnet6.gateway.present? -%>
+<% if subnet6 && subnet6.gateway.present? -%>
 IPV6_DEFAULTGW=<%= subnet6.gateway %>
 <% end -%>
 IPV6_PEERDNS=no
@@ -53,14 +53,14 @@ BOOTPROTO="<%= dhcp ? 'dhcp' : 'none' -%>"
 <% unless dhcp || subnet.nil? -%>
 IPADDR="<%= bond.ip -%>"
 NETMASK="<%= subnet.mask -%>"
-<% if subnet.gateway.present? -%>
+<% if subnet && subnet.gateway.present? -%>
 GATEWAY="<%= subnet.gateway %>"
 <% end -%>
 <% if bond.ip6.present? -%>
 IPV6INIT=yes
 IPV6_AUTOCONF=no
 IPV6ADDR=<%= bond.ip6 %>
-<% if subnet6.gateway.present? -%>
+<% if subnet6 && subnet6.gateway.present? -%>
 IPV6_DEFAULTGW=<%= subnet6.gateway %>
 <% end -%>
 IPV6_PEERDNS=no
@@ -152,7 +152,7 @@ BOOTPROTO="<%= dhcp ? 'dhcp' : 'none' -%>"
 <% unless dhcp -%>
 IPADDR="<%= interface.ip -%>"
 NETMASK="<%= subnet.mask -%>"
-<% if subnet.gateway.present? -%>
+<% if subnet && subnet.gateway.present? -%>
 GATEWAY="<%= subnet.gateway %>"
 <% end -%>
 <% end -%>
@@ -180,7 +180,7 @@ DEFROUTE=no
 IPV6INIT=yes
 IPV6_AUTOCONF=no
 IPV6ADDR=<%= @host.ip6 %>
-<% if subnet6.gateway.present? -%>
+<% if subnet6 && subnet6.gateway.present? -%>
 IPV6_DEFAULTGW=<%= subnet6.gateway %>
 <% end -%>
 IPV6_PEERDNS=no