diff --git a/manifests/init.pp b/manifests/init.pp index ceae669133405bcd1e7e7ab8cb2d0aa72e075098..6624d4c09c257c8b3f3d88e868945f8925545253 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -132,6 +132,8 @@ class network ( $hiera_merge = false, + $vlan = undef, + ) inherits ::network::params { # Hiera import diff --git a/templates/hostname-RedHat.erb b/templates/hostname-RedHat.erb index ba0a82b707a27408761081eba06c68b54cb95290..4c3b47007e41f89ea82e17a13ef61c023794e8da 100644 --- a/templates/hostname-RedHat.erb +++ b/templates/hostname-RedHat.erb @@ -10,4 +10,8 @@ NOZEROCONF="<%= @nozeroconf %>" NETWORKING_IPV6="<%= @ipv6enable %>" IPV6INIT="<%= @ipv6enable %>" <% end -%> -HOSTNAME="<%= @manage_hostname.split('.').first %>" +<% if @hostname -%>HOSTNAME="<%= @hostname %>" +<%- else %>HOSTNAME="<%= @manage_hostname.split('.').first %>" +<% end -%> +<% if @vlan -%>VLAN="<%= @vlan %>" +<% end -%>