From fcf7b069c1b73014ebc49b576a3bbcfafb2e1a6d Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Fri, 12 Sep 2014 10:43:55 -0700
Subject: [PATCH] Add more @ signs to logs-dev and status vhosts

To make puppet more happy.

Change-Id: I22755ef7d7772b2dbf68b0663985785f50767d14
---
 .../templates/logs-dev.vhost.erb              | 40 +++++++++----------
 .../templates/status.vhost.erb                | 24 +++++------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/modules/openstack_project/templates/logs-dev.vhost.erb b/modules/openstack_project/templates/logs-dev.vhost.erb
index a6df51cc0d..9191baa644 100644
--- a/modules/openstack_project/templates/logs-dev.vhost.erb
+++ b/modules/openstack_project/templates/logs-dev.vhost.erb
@@ -3,15 +3,15 @@
 # Managed by Puppet
 # ************************************
 
-NameVirtualHost <%= vhost_name %>:<%= port %>
-<VirtualHost <%= vhost_name %>:<%= port %>>
-  ServerName <%= srvname %>
-<% if serveraliases.is_a? Array -%>
-<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
-<% elsif serveraliases != '' -%>
-<%= " ServerAlias #{serveraliases}" %>
+NameVirtualHost <%= @vhost_name %>:<%= @port %>
+<VirtualHost <%= @vhost_name %>:<%= @port %>>
+  ServerName <%= @srvname %>
+<% if @serveraliases.is_a? Array -%>
+<% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
+<% elsif @serveraliases != '' -%>
+<%= " ServerAlias #{@serveraliases}" %>
 <% end -%>
-  DocumentRoot <%= docroot %>
+  DocumentRoot <%= @docroot %>
 
   # use Apache to compress the results afterwards, to save on the wire
   # it's approx 18x savings of wire traffic to compress. We need to
@@ -23,37 +23,37 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
     AddDefaultCharset UTF-8
     AddEncoding x-gzip gz
   </FilesMatch>
-  <Directory <%= docroot %>>
-    Options <%= options %>
+  <Directory <%= @docroot %>>
+    Options <%= @options %>
     AllowOverride None
     Order allow,deny
     allow from all
   </Directory>
 
-  <Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*>
+  <Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*>
      ReadmeName /help/tempest-overview.html
   </Directory>
-  <Directory <%= docroot %>/periodic*/*/*-tempest-dsvm*/*>
+  <Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*>
      ReadmeName /help/tempest-overview.html
   </Directory>
-  <Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/>
+  <Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/>
      ReadmeName /help/tempest-logs.html
   </Directory>
-  <Directory <%= docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/>
+  <Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/>
      ReadmeName /help/tempest-logs.html
   </Directory>
 
   # old patterns, can be removed in July 2014
-  <Directory <%= docroot %>/*/*/*/*/gate-tempest-devstack*/*>
+  <Directory <%= @docroot %>/*/*/*/*/gate-tempest-devstack*/*>
      ReadmeName /help/tempest-overview.html
   </Directory>
-  <Directory <%= docroot %>/periodic/*/periodic-tempest-devstack*/*>
+  <Directory <%= @docroot %>/periodic/*/periodic-tempest-devstack*/*>
      ReadmeName /help/tempest-overview.html
   </Directory>
-  <Directory <%= docroot %>/*/*/*/*/gate-tempest-devstack*/*/logs/>
+  <Directory <%= @docroot %>/*/*/*/*/gate-tempest-devstack*/*/logs/>
      ReadmeName /help/tempest-logs.html
   </Directory>
-  <Directory <%= docroot %>/periodic/*/periodic-tempest-devstack*/*/logs/>
+  <Directory <%= @docroot %>/periodic/*/periodic-tempest-devstack*/*/logs/>
      ReadmeName /help/tempest-logs.html
   </Directory>
 
@@ -76,8 +76,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
 
   WSGIScriptAlias /htmlify /usr/local/lib/python2.7/dist-packages/os_loganalyze/wsgi.py
 
-  ErrorLog /var/log/apache2/<%= name %>_error.log
+  ErrorLog /var/log/apache2/<%= @name %>_error.log
   LogLevel warn
-  CustomLog /var/log/apache2/<%= name %>_access.log combined
+  CustomLog /var/log/apache2/<%= @name %>_access.log combined
   ServerSignature Off
 </VirtualHost>
diff --git a/modules/openstack_project/templates/status.vhost.erb b/modules/openstack_project/templates/status.vhost.erb
index 5fb001e0c9..e64b4ed046 100644
--- a/modules/openstack_project/templates/status.vhost.erb
+++ b/modules/openstack_project/templates/status.vhost.erb
@@ -2,15 +2,15 @@
 # Managed by Puppet
 # ************************************
 
-NameVirtualHost <%= vhost_name %>:<%= port %>
-<VirtualHost <%= vhost_name %>:<%= port %>>
-  ServerName <%= srvname %>
-<% if serveraliases.is_a? Array -%>
-<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
-<% elsif serveraliases != '' -%>
-<%= " ServerAlias #{serveraliases}" %>
+NameVirtualHost <%= @vhost_name %>:<%= @port %>
+<VirtualHost <%= @vhost_name %>:<%= @port %>>
+  ServerName <%= @srvname %>
+<% if @serveraliases.is_a? Array -%>
+<% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
+<% elsif @serveraliases != '' -%>
+<%= " ServerAlias #{@serveraliases}" %>
 <% end -%>
-  DocumentRoot <%= docroot %>
+  DocumentRoot <%= @docroot %>
 
   Alias /bugday /srv/static/bugdaystats
   <Directory /srv/static/bugdaystats>
@@ -28,8 +28,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
 
   Alias /release /srv/static/release
 
-  <Directory <%= docroot %>>
-    Options <%= options %>
+  <Directory <%= @docroot %>>
+    Options <%= @options %>
     AllowOverride None
     Order allow,deny
     allow from all
@@ -54,8 +54,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
   </Directory>
 
 
-  ErrorLog /var/log/apache2/<%= name %>_error.log
+  ErrorLog /var/log/apache2/<%= @name %>_error.log
   LogLevel warn
-  CustomLog /var/log/apache2/<%= name %>_access.log combined
+  CustomLog /var/log/apache2/<%= @name %>_access.log combined
   ServerSignature Off
 </VirtualHost>