Merge "Fix template variables"

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 -%>