From de50cfa7bd457dc776adc18efafd1ebdf86e7446 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fabien.boucher@enovance.com>
Date: Mon, 13 Jul 2015 10:19:59 +0000
Subject: [PATCH] Fix variables access warning in logs.vhost template

Use @varname to supress warnings

Change-Id: Iffd343c3f227f3797b1c42e2fb36ac0518bcc529
---
 templates/logs.vhost.erb | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/templates/logs.vhost.erb b/templates/logs.vhost.erb
index 1bec5be..9b9b915 100644
--- a/templates/logs.vhost.erb
+++ b/templates/logs.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,8 +23,8 @@ 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
@@ -35,30 +35,30 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
     Satisfy Any
   </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>
 
@@ -84,8 +84,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>