Fix template variables

We almost never define $serveraliases which means that it's always going
to be empty. Puppet 4 is more strict about types and converting undef to
nil so this change makes sure that an undefined variable doesn't
accidentally get evaluated as existing and cause an invalid apache
config.

In the places where we're already just comparing @serveraliases to nil,
just leave them alone. Nil should be the expected value for undefined
variables going forward in puppet 4, so as long as it's working in
puppet 3 let's keep it.

Change-Id: I68ea8e1fde5d422f821453ff618d827e3cbe1c43

modules/openstack_project/templates/legacy.vhost.erb

@@ -7,7 +7,7 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
   ServerName <%= @srvname %>
 <% if @serveraliases.is_a? Array -%>
 <% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
-<% elsif @serveraliases != '' -%>
+<% elsif ! ['', nil].include?(@serveraliases) -%>
 <%= " ServerAlias #{@serveraliases}" %>
 <% end -%>
 

modules/openstack_project/templates/static-governance.vhost.erb

@@ -6,7 +6,7 @@
   ServerName <%= @vhost_name %>
 <% if @serveraliases.is_a? Array -%>
 <% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
-<% elsif @serveraliases != '' -%>
+<% elsif ! ['', nil].include?(@serveraliases) -%>
 <%= " ServerAlias #{@serveraliases}" %>
 <% end -%>
   RewriteEngine On

modules/openstack_project/templates/static-http-and-https.vhost.erb

@@ -7,7 +7,7 @@
 <% if @serveraliases.is_a? Array -%>
   # Permanently redirect these ServerAlias entries to ServerName
 <% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
-<% elsif @serveraliases != '' -%>
+<% elsif ! ['', nil].include?(@serveraliases) -%>
 <%= " ServerAlias #{@serveraliases}" %>
   RewriteEngine On
   RewriteCond %{HTTP_HOST} !<%= @vhost_name %>$ [NC]

modules/openstack_project/templates/static-https-redirect.vhost.erb

@@ -6,7 +6,7 @@
   ServerName <%= @vhost_name %>
 <% if @serveraliases.is_a? Array -%>
 <% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
-<% elsif @serveraliases != '' -%>
+<% elsif ! ['', nil].include?(@serveraliases) -%>
 <%= " ServerAlias #{@serveraliases}" %>
 <% end -%>
   RewriteEngine On

modules/openstack_project/templates/status.vhost.erb

@@ -7,7 +7,7 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
   ServerName <%= @srvname %>
 <% if @serveraliases.is_a? Array -%>
 <% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
-<% elsif @serveraliases != '' -%>
+<% elsif ! ['', nil].include?(@serveraliases) -%>
 <%= " ServerAlias #{@serveraliases}" %>
 <% end -%>
   DocumentRoot <%= @docroot %>

modules/openstack_project/templates/summit.vhost.erb

@@ -7,7 +7,7 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
   ServerName <%= @srvname %>
 <% if @serveraliases.is_a? Array -%>
 <% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
-<% elsif @serveraliases != '' -%>
+<% elsif ! ['', nil].include?(@serveraliases) -%>
 <%= " ServerAlias #{@serveraliases}" %>
 <% end -%>