From 82b9b59522928863ddadeacfec819e287303ef20 Mon Sep 17 00:00:00 2001
From: Spencer Krum <nibz@cat.pdx.edu>
Date: Wed, 18 Jun 2014 15:44:01 -0700
Subject: [PATCH] Fixing deprecation warnings
Non instance variable representation is deprecated
so needs to be changed. This change changes varibles
to their instance variable representation.
See more details see:
http://docs.puppetlabs.com/guides/templating.html
Change-Id: Ib77827e01011ef6c0380c9ec7a9d147eafd8ce2f
---
.../templates/elasticsearch.default.erb | 2 +-
.../templates/elasticsearch.yml.erb | 40 +++---
modules/exim/templates/aliases.erb | 4 +-
modules/exim/templates/exim.sysconfig.erb | 2 +-
modules/exim/templates/exim4.conf.erb | 20 +--
modules/exim/templates/exim4.default.erb | 2 +-
.../templates/contact_information.pub.erb | 2 +-
modules/gerrit/templates/gerrit.config.erb | 116 +++++++++---------
.../gerrit/templates/replication.config.erb | 2 +-
modules/gerrit/templates/secure.config.erb | 4 +-
.../gerritbot/templates/gerritbot.config.erb | 10 +-
.../github-projects.secure.config.erb | 4 +-
.../github/templates/github.secure.config.erb | 4 +-
.../jeepyb/templates/openstackwatch.ini.erb | 16 +--
modules/jenkins/templates/cgconfig.erb | 14 +--
modules/logrotate/templates/config.erb | 20 +--
.../templates/jenkinsci-curl.erb | 2 +-
.../templates/logs-dev.vhost.erb | 38 +++---
.../templates/logs.vhost.erb | 40 +++---
.../templates/mavencentral-curl.erb | 2 +-
.../templates/pbx/asterisk/sip.conf.erb | 4 +-
.../openstack_project/templates/pypirc.erb | 4 +-
.../templates/transifexrc.erb | 4 +-
.../templates/recheckwatch.conf.erb | 4 +-
modules/salt/templates/minion.erb | 2 +-
modules/ulimit/templates/limits.erb | 2 +-
.../templates/50unattended-upgrades.erb | 4 +-
modules/zuul/templates/zuul.conf.erb | 52 ++++----
28 files changed, 210 insertions(+), 210 deletions(-)
diff --git a/modules/elasticsearch/templates/elasticsearch.default.erb b/modules/elasticsearch/templates/elasticsearch.default.erb
index 97ca4500db..2fd5a26510 100644
--- a/modules/elasticsearch/templates/elasticsearch.default.erb
+++ b/modules/elasticsearch/templates/elasticsearch.default.erb
@@ -3,7 +3,7 @@
#ES_GROUP=elasticsearch
# Heap Size (defaults to 256m min, 1g max)
-ES_HEAP_SIZE=<%= heap_size %>
+ES_HEAP_SIZE=<%= @heap_size %>
# Heap new generation
#ES_HEAP_NEWSIZE=
diff --git a/modules/elasticsearch/templates/elasticsearch.yml.erb b/modules/elasticsearch/templates/elasticsearch.yml.erb
index b612213e9f..f993df6dd3 100644
--- a/modules/elasticsearch/templates/elasticsearch.yml.erb
+++ b/modules/elasticsearch/templates/elasticsearch.yml.erb
@@ -135,14 +135,14 @@ node.name: "<%= scope.lookupvar("::hostname") %>"
# Use the Index Status API (<http://localhost:9200/A/_status>) to inspect
# the index status.
-<% if es_template_config.has_key?('index.store.compress.stored') then -%>
-index.store.compress.stored: <%= es_template_config['index.store.compress.stored'] %>
+<% if @es_template_config.has_key?('index.store.compress.stored') then -%>
+index.store.compress.stored: <%= @es_template_config['index.store.compress.stored'] %>
<% end -%>
-<% if es_template_config.has_key?('index.store.compress.tv') then -%>
-index.store.compress.tv: <%= es_template_config['index.store.compress.tv'] %>
+<% if @es_template_config.has_key?('index.store.compress.tv') then -%>
+index.store.compress.tv: <%= @es_template_config['index.store.compress.tv'] %>
<% end -%>
-<% if es_template_config.has_key?('indices.memory.index_buffer_size') then -%>
-indices.memory.index_buffer_size: "<%= es_template_config['indices.memory.index_buffer_size'] %>"
+<% if @es_template_config.has_key?('indices.memory.index_buffer_size') then -%>
+indices.memory.index_buffer_size: "<%= @es_template_config['indices.memory.index_buffer_size'] %>"
<% end -%>
#################################### Paths ####################################
@@ -188,8 +188,8 @@ indices.memory.index_buffer_size: "<%= es_template_config['indices.memory.index_
#
# Set this property to true to lock the memory:
#
-<% if es_template_config.has_key?('bootstrap.mlockall') then -%>
-bootstrap.mlockall: <%= es_template_config['bootstrap.mlockall'] %>
+<% if @es_template_config.has_key?('bootstrap.mlockall') then -%>
+bootstrap.mlockall: <%= @es_template_config['bootstrap.mlockall'] %>
<% else -%>
# bootstrap.mlockall: true
<% end -%>
@@ -263,8 +263,8 @@ bootstrap.mlockall: <%= es_template_config['bootstrap.mlockall'] %>
# Allow recovery process after N nodes in a cluster are up:
#
-<% if es_template_config.has_key?('gateway.recover_after_nodes') then -%>
-gateway.recover_after_nodes: <%= es_template_config['gateway.recover_after_nodes'] %>
+<% if @es_template_config.has_key?('gateway.recover_after_nodes') then -%>
+gateway.recover_after_nodes: <%= @es_template_config['gateway.recover_after_nodes'] %>
<% else -%>
# gateway.recover_after_nodes: 1
<% end -%>
@@ -272,8 +272,8 @@ gateway.recover_after_nodes: <%= es_template_config['gateway.recover_after_nodes
# Set the timeout to initiate the recovery process, once the N nodes
# from previous setting are up (accepts time value):
#
-<% if es_template_config.has_key?('gateway.recover_after_time') then -%>
-gateway.recover_after_time: <%= es_template_config['gateway.recover_after_time'] %>
+<% if @es_template_config.has_key?('gateway.recover_after_time') then -%>
+gateway.recover_after_time: <%= @es_template_config['gateway.recover_after_time'] %>
<% else -%>
# gateway.recover_after_time: 5m
<% end -%>
@@ -282,8 +282,8 @@ gateway.recover_after_time: <%= es_template_config['gateway.recover_after_time']
# are up (and recover_after_nodes is met), begin recovery process immediately
# (without waiting for recover_after_time to expire):
#
-<% if es_template_config.has_key?('gateway.expected_nodes') then -%>
-gateway.expected_nodes: <%= es_template_config['gateway.expected_nodes'] %>
+<% if @es_template_config.has_key?('gateway.expected_nodes') then -%>
+gateway.expected_nodes: <%= @es_template_config['gateway.expected_nodes'] %>
<% else -%>
# gateway.expected_nodes: 2
<% end -%>
@@ -324,8 +324,8 @@ gateway.expected_nodes: <%= es_template_config['gateway.expected_nodes'] %>
# operational within the cluster. Set this option to a higher value (2-4)
# for large clusters (>3 nodes):
#
-<% if es_template_config.has_key?('discovery.zen.minimum_master_nodes') then -%>
-discovery.zen.minimum_master_nodes: <%= es_template_config['discovery.zen.minimum_master_nodes'] %>
+<% if @es_template_config.has_key?('discovery.zen.minimum_master_nodes') then -%>
+discovery.zen.minimum_master_nodes: <%= @es_template_config['discovery.zen.minimum_master_nodes'] %>
<% else -%>
# discovery.zen.minimum_master_nodes: 1
<% end -%>
@@ -345,8 +345,8 @@ discovery.zen.minimum_master_nodes: <%= es_template_config['discovery.zen.minimu
#
# 1. Disable multicast discovery (enabled by default):
#
-<% if es_template_config.has_key?('discovery.zen.ping.multicast.enabled') then -%>
-discovery.zen.ping.multicast.enabled: <%= es_template_config['discovery.zen.ping.multicast.enabled'] %>
+<% if @es_template_config.has_key?('discovery.zen.ping.multicast.enabled') then -%>
+discovery.zen.ping.multicast.enabled: <%= @es_template_config['discovery.zen.ping.multicast.enabled'] %>
<% else -%>
# discovery.zen.ping.multicast.enabled: false
<% end -%>
@@ -356,8 +356,8 @@ discovery.zen.ping.multicast.enabled: <%= es_template_config['discovery.zen.ping
#
# discovery.zen.ping.unicast.hosts: ["host1", "host2:port", "host3[portX-portY]"]
#
-<% if es_template_config.has_key?('discovery.zen.ping.unicast.hosts') then -%>
-discovery.zen.ping.unicast.hosts: ["<%= es_template_config['discovery.zen.ping.unicast.hosts'].join("\", \"") %>"]
+<% if @es_template_config.has_key?('discovery.zen.ping.unicast.hosts') then -%>
+discovery.zen.ping.unicast.hosts: ["<%= @es_template_config['discovery.zen.ping.unicast.hosts'].join("\", \"") %>"]
<% end -%>
# EC2 discovery allows to use AWS EC2 API in order to perform discovery.
diff --git a/modules/exim/templates/aliases.erb b/modules/exim/templates/aliases.erb
index d3204c8619..626ea4ac66 100644
--- a/modules/exim/templates/aliases.erb
+++ b/modules/exim/templates/aliases.erb
@@ -14,6 +14,6 @@ security: root
gerrit2: root
jenkins: root
-<% if sysadmin.length > 0 -%>
-root: <%= sysadmin.join(",") %>
+<% if @sysadmin.length > 0 -%>
+root: <%= @sysadmin.join(",") %>
<% end -%>
diff --git a/modules/exim/templates/exim.sysconfig.erb b/modules/exim/templates/exim.sysconfig.erb
index 1f0df561b3..7e2a691849 100644
--- a/modules/exim/templates/exim.sysconfig.erb
+++ b/modules/exim/templates/exim.sysconfig.erb
@@ -1,2 +1,2 @@
DAEMON=yes
-QUEUE=<%= queue_interval %>
+QUEUE=<%= @queue_interval %>
diff --git a/modules/exim/templates/exim4.conf.erb b/modules/exim/templates/exim4.conf.erb
index b5be96d4f2..97ccfcc395 100644
--- a/modules/exim/templates/exim4.conf.erb
+++ b/modules/exim/templates/exim4.conf.erb
@@ -56,7 +56,7 @@ CONFDIR = <%= scope.lookupvar('exim::params::conf_dir') %>
# +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They
# are all colon-separated lists:
-domainlist local_domains = @<% if mailman_domains.length > 0 -%>:<%= mailman_domains.join(":") %><% end -%>
+domainlist local_domains = @<% if @mailman_domains.length > 0 -%>:<%= @mailman_domains.join(":") %><% end -%>
domainlist relay_to_domains =
hostlist relay_from_hosts = 127.0.0.1
@@ -299,7 +299,7 @@ timeout_frozen_after = 7d
# interlock with other processes, so additional queue runners can be
# started by other means, or by killing and restarting the daemon.
-queue_run_max = <%= queue_run_max %>
+queue_run_max = <%= @queue_run_max %>
# When this option is set, a delivery process is started whenever a
# message is received, routing is performed, and local deliveries take
@@ -313,11 +313,11 @@ queue_run_max = <%= queue_run_max %>
# to be queued in this way, and is equivalent to setting
# queue_smtp_domains to "*". See also hold_domains and queue_domains.
-<% if queue_smtp_domains != "" -%>
-queue_smtp_domains = <%= queue_smtp_domains %>
+<% if @queue_smtp_domains != "" -%>
+queue_smtp_domains = <%= @queue_smtp_domains %>
<% end %>
-<% if mailman_domains.length > 0 -%>
+<% if @mailman_domains.length > 0 -%>
# Home dir for your Mailman installation -- aka Mailman's prefix
# directory.
MM_HOME=/var/lib/mailman
@@ -330,7 +330,7 @@ MM_GID=list
#
# Domains that your lists are in - colon separated list
# you may wish to add these into local_domains as well
-domainlist mm_domains=<%= mailman_domains.join(":") %>
+domainlist mm_domains=<%= @mailman_domains.join(":") %>
#
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#
@@ -559,7 +559,7 @@ acl_check_data:
begin routers
-<% if mailman_domains.length > 0 -%>
+<% if @mailman_domains.length > 0 -%>
# Pick up on messages from our local mailman and route them via our
# special VERP-enabled transport
#
@@ -621,12 +621,12 @@ mailman_router:
# If the DNS lookup fails, no further routers are tried because of the no_more
# setting, and consequently the address is unrouteable.
-<% if smarthost -%>
+<% if @smarthost -%>
smarthost:
driver = manualroute
domains = !+local_domains
transport = remote_smtp
- route_list = * <%= smarthost %>
+ route_list = * <%= @smarthost %>
no_more
<% else -%>
dnslookup:
@@ -754,7 +754,7 @@ address_file:
address_reply:
driver = autoreply
-<% if mailman_domains.length > 0 -%>
+<% if @mailman_domains.length > 0 -%>
mailman_transport:
driver = pipe
command = MM_WRAP \
diff --git a/modules/exim/templates/exim4.default.erb b/modules/exim/templates/exim4.default.erb
index c167bdf5a2..39475d35f3 100644
--- a/modules/exim/templates/exim4.default.erb
+++ b/modules/exim/templates/exim4.default.erb
@@ -10,7 +10,7 @@ EX4DEF_VERSION=''
# setting this to 'no' will also disable queueruns from /etc/ppp/ip-up.d/exim4
QUEUERUNNER='combined'
# how often should we run the queue
-QUEUEINTERVAL='<%= queue_interval %>'
+QUEUEINTERVAL='<%= @queue_interval %>'
# options common to quez-runner and listening daemon
COMMONOPTIONS=''
# more options for the daemon/process running the queue (applies to the one
diff --git a/modules/gerrit/templates/contact_information.pub.erb b/modules/gerrit/templates/contact_information.pub.erb
index 2122bc484c..0e95adc7d3 100644
--- a/modules/gerrit/templates/contact_information.pub.erb
+++ b/modules/gerrit/templates/contact_information.pub.erb
@@ -1 +1 @@
-<%= contactstore_pubkey %>
+<%= @contactstore_pubkey %>
diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb
index a918328c64..2539b6eea0 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -3,90 +3,90 @@
[gerrit]
basePath = git
- canonicalWebUrl = <%= canonicalweburl %>
+ canonicalWebUrl = <%= @canonicalweburl %>
[database]
type = MYSQL
- hostname = <%= mysql_host %>
+ hostname = <%= @mysql_host %>
database = reviewdb
username = gerrit2
-<% if database_poollimit != "" -%>
- poolLimit = <%= database_poollimit %>
+<% if @database_poollimit != "" -%>
+ poolLimit = <%= @database_poollimit %>
<% end -%>
connectionpool = true
[auth]
-<% if gerrit_contributor_agreement -%>
+<% if @gerrit_contributor_agreement -%>
contributorAgreements = true
<% end -%>
- type = <%= gerrit_auth_type %>
+ type = <%= @gerrit_auth_type %>
cookieSecure = true
enableRunAs = true
-<% if gerrit_auth_type == 'OPENID_SSO' -%>
- openIdSsoUrl = <%= openidssourl %>
+<% if @gerrit_auth_type == 'OPENID_SSO' -%>
+ openIdSsoUrl = <%= @openidssourl %>
<% end -%>
-<% if gerrit_auth_type == 'LDAP' -%>
+<% if @gerrit_auth_type == 'LDAP' -%>
[ldap]
- server = <%= ldap_server %>
- accountBase = <%= ldap_account_base %>
- <% if ldap_username -%>username = <%= ldap_username %><%end%>
- <% if ldap_password -%>password = <%= ldap_password %><%end%>
- <% if ldap_accountfullname -%>accountFullName = <%= ldap_accountfullname %><%end%>
- accountPattern = <%= ldap_account_pattern %>
- accountEmailAddress = <%= ldap_account_email_address %>
- sslVerify = <%= ldap_sslverify %>
- <% if @ldap_ssh_account_name -%>accountSshUserName = <%= ldap_ssh_account_name %><%end%>
+ server = <%= @ldap_server %>
+ accountBase = <%= @ldap_account_base %>
+ <% if @ldap_username -%>username = <%= @ldap_username %><%end%>
+ <% if @ldap_password -%>password = <%= @ldap_password %><%end%>
+ <% if @ldap_accountfullname -%>accountFullName = <%= @ldap_accountfullname %><%end%>
+ accountPattern = <%= @ldap_account_pattern %>
+ accountEmailAddress = <%= @ldap_account_email_address %>
+ sslVerify = <%= @ldap_sslverify %>
+ <% if @ldap_ssh_account_name -%>accountSshUserName = <%= @ldap_ssh_account_name %><%end%>
<% end %>
[sendemail]
- smtpServer = <%= smtpserver %>
- from = <%= sendemail_from %>
+ smtpServer = <%= @smtpserver %>
+ from = <%= @sendemail_from %>
[container]
user = gerrit2
- javaHome = <%= java_home %>
-<% if container_heaplimit != "" -%>
- heapLimit = <%= container_heaplimit %>
+ javaHome = <%= @java_home %>
+<% if @container_heaplimit != "" -%>
+ heapLimit = <%= @container_heaplimit %>
<% end -%>
[core]
-<% if core_packedgitopenfiles != "" -%>
- packedGitOpenFiles = <%= core_packedgitopenfiles %>
+<% if @core_packedgitopenfiles != "" -%>
+ packedGitOpenFiles = <%= @core_packedgitopenfiles %>
<% end -%>
-<% if core_packedgitlimit != "" -%>
- packedGitLimit = <%= core_packedgitlimit %>
+<% if @core_packedgitlimit != "" -%>
+ packedGitLimit = <%= @core_packedgitlimit %>
<% end -%>
-<% if core_packedgitwindowsize != "" -%>
- packedGitWindowSize = <%= core_packedgitwindowsize %>
+<% if @core_packedgitwindowsize != "" -%>
+ packedGitWindowSize = <%= @core_packedgitwindowsize %>
<% end -%>
[sshd]
- listenAddress = <%= sshd_listen_address %>
-<% if sshd_threads != "" -%>
- threads = <%= sshd_threads %>
+ listenAddress = <%= @sshd_listen_address %>
+<% if @sshd_threads != "" -%>
+ threads = <%= @sshd_threads %>
<% end -%>
[httpd]
listenUrl = proxy-https://*:8081/
-<% if httpd_maxwait != "" -%>
- maxWait = <%= httpd_maxwait %>
+<% if @httpd_maxwait != "" -%>
+ maxWait = <%= @httpd_maxwait %>
<% end -%>
-<% if httpd_acceptorthreads != "" -%>
- acceptorThreads = <%= httpd_acceptorthreads %>
+<% if @httpd_acceptorthreads != "" -%>
+ acceptorThreads = <%= @httpd_acceptorthreads %>
<% end -%>
-<% if httpd_minthreads != "" -%>
- minThreads = <%= httpd_minthreads %>
+<% if @httpd_minthreads != "" -%>
+ minThreads = <%= @httpd_minthreads %>
<% end -%>
-<% if httpd_maxthreads != "" -%>
- maxThreads = <%= httpd_maxthreads %>
+<% if @httpd_maxthreads != "" -%>
+ maxThreads = <%= @httpd_maxthreads %>
<% end -%>
[cache]
directory = cache
[cache "web_sessions"]
maxAge = 1d
[user]
- email = <%= email %>
-<% commentlinks.each do |commentlink| -%>
-[commentlink "<%= commentlink['name'] %>"]
- match = "<%= commentlink['match'] %>"
-<% if commentlink['link'] != "" -%>
- link = "<%= commentlink['link'] %>"
+ email = <%= @email %>
+<% @commentlinks.each do |commentlink| -%>
+[commentlink "<%= @commentlink['name'] %>"]
+ match = "<%= @commentlink['match'] %>"
+<% if @commentlink['link'] != "" -%>
+ link = "<%= @commentlink['link'] %>"
<% end -%>
-<% if commentlink['html'] != "" -%>
- html = "<%= commentlink['html'] %>"
+<% if @commentlink['html'] != "" -%>
+ html = "<%= @commentlink['html'] %>"
<% end -%>
<% end -%>
[theme]
@@ -99,13 +99,13 @@
tableOddRowColor = ffffff
tableEvenRowColor = f5f5ff
[melody]
- monitoring = <%= enable_melody %>
- session = <%= melody_session %>
+ monitoring = <%= @enable_melody %>
+ session = <%= @melody_session %>
[plugin "javamelody"]
- allowTopMenu = <%= enable_javamelody_top_menu %>
-<% if gitweb or cgit -%>
+ allowTopMenu = <%= @enable_javamelody_top_menu %>
+<% if @gitweb or @cgit -%>
[gitweb]
-<% if gitweb -%>
+<% if @gitweb -%>
revision = "?p=${project}.git;a=commitdiff;h=${commit}"
<% else -%>
type = cgit
@@ -114,14 +114,14 @@
url = "<%= scope.lookupvar('gerrit::web_repo_url') %>"
<% end -%>
<% end -%>
-<% if contactstore == true -%>
+<% if @contactstore == true -%>
[contactstore]
- appsec = <%= contactstore_appsec %>
- url = <%= contactstore_url %>
+ appsec = <%= @contactstore_appsec %>
+ url = <%= @contactstore_url %>
<% end -%>
-<% if secondary_index == true -%>
+<% if @secondary_index == true -%>
[index]
- type = <%= secondary_index_type %>
+ type = <%= @secondary_index_type %>
<% end -%>
[mimetype "image/*"]
safe = true
diff --git a/modules/gerrit/templates/replication.config.erb b/modules/gerrit/templates/replication.config.erb
index 3ab3283e6a..6d597b68fb 100644
--- a/modules/gerrit/templates/replication.config.erb
+++ b/modules/gerrit/templates/replication.config.erb
@@ -1,7 +1,7 @@
# This file is managed by puppet.
# https://git.openstack.org/cgit/openstack-infra/config
-<% replication.each do |replication| -%>
+<% @replication.each do |replication| -%>
[remote "<%= replication['name'] %>"]
url = <%= replication['url'] %>${name}.git
<% if replication['replicationDelay'] != nil -%>
diff --git a/modules/gerrit/templates/secure.config.erb b/modules/gerrit/templates/secure.config.erb
index 51af8c1e0e..a33100c737 100644
--- a/modules/gerrit/templates/secure.config.erb
+++ b/modules/gerrit/templates/secure.config.erb
@@ -1,4 +1,4 @@
[database]
- password = <%= mysql_password %>
+ password = <%= @mysql_password %>
[auth]
- registerEmailPrivateKey = <%= email_private_key %>
+ registerEmailPrivateKey = <%= @email_private_key %>
diff --git a/modules/gerritbot/templates/gerritbot.config.erb b/modules/gerritbot/templates/gerritbot.config.erb
index e8c2fcdca7..cf68cffed2 100644
--- a/modules/gerritbot/templates/gerritbot.config.erb
+++ b/modules/gerritbot/templates/gerritbot.config.erb
@@ -1,14 +1,14 @@
[ircbot]
-nick=<%= nick %>
-pass=<%= password %>
-server=<%= server %>
+nick=<%= @nick %>
+pass=<%= @password %>
+server=<%= @server %>
port=6667
channel_config=/etc/gerritbot/channel_config.yaml
lockfile=/var/run/gerritbot/gerritbot.pid
log_config=/etc/gerritbot/logging.config
[gerrit]
-user=<%= user %>
+user=<%= @user %>
key=/home/gerrit2/.ssh/gerritbot_rsa
-host=<%= vhost_name %>
+host=<%= @vhost_name %>
port=29418
diff --git a/modules/github/templates/github-projects.secure.config.erb b/modules/github/templates/github-projects.secure.config.erb
index 887c2a7038..8af72e72a2 100644
--- a/modules/github/templates/github-projects.secure.config.erb
+++ b/modules/github/templates/github-projects.secure.config.erb
@@ -1,3 +1,3 @@
[github]
-username = <%= project_username %>
-password = <%= project_password %>
+username = <%= @project_username %>
+password = <%= @project_password %>
diff --git a/modules/github/templates/github.secure.config.erb b/modules/github/templates/github.secure.config.erb
index 92e1493c7b..7e87b5a933 100644
--- a/modules/github/templates/github.secure.config.erb
+++ b/modules/github/templates/github.secure.config.erb
@@ -1,3 +1,3 @@
[github]
-username = <%= username %>
-oauth_token = <%= oauth_token %>
+username = <%= @username %>
+oauth_token = <%= @oauth_token %>
diff --git a/modules/jeepyb/templates/openstackwatch.ini.erb b/modules/jeepyb/templates/openstackwatch.ini.erb
index de290b2287..6a27df4108 100644
--- a/modules/jeepyb/templates/openstackwatch.ini.erb
+++ b/modules/jeepyb/templates/openstackwatch.ini.erb
@@ -2,35 +2,35 @@
[general]
# only show certain projects (don't forget the openstack/ as start)
-projects = <%= projects.join(", ") %>
+projects = <%= @projects.join(", ") %>
# The Json URL where is the gerrit system.
-json_url = <%= json_url %>
+json_url = <%= @json_url %>
# Allow different mode to output to swift, by default 'combined' will
# combined all rss in one and 'multiple' will upload all the projects
# in each rss file.
-output_mode = <%= mode %>
+output_mode = <%= @mode %>
# username to your swift cluster
[swift]
# username/tenant for swift with 2.0 or just username with 1.0 (i.e:
# RAX).
-username = <%= swift_username %>
+username = <%= @swift_username %>
# password or api key
-password = <%= swift_password %>
+password = <%= @swift_password %>
# container to upload (probably want to be public)
-container = <%= container %>
+container = <%= @container %>
# auth_url of the cluster, for Rackspace this is :
# https://auth.api.rackspacecloud.com/v1.0
# or Rackspace UK :
# https://lon.auth.api.rackspacecloud.com/v1.0
-auth_url = <%= swift_auth_url %>
+auth_url = <%= @swift_auth_url %>
# auth version (1.0 for Rackspace clouds, 2.0 for keystone backend clusters)
-auth_version = <%= auth_version %>
+auth_version = <%= @auth_version %>
# vim: ft=dosini
diff --git a/modules/jenkins/templates/cgconfig.erb b/modules/jenkins/templates/cgconfig.erb
index 055c225d6b..7fe0687d5b 100644
--- a/modules/jenkins/templates/cgconfig.erb
+++ b/modules/jenkins/templates/cgconfig.erb
@@ -1,7 +1,7 @@
-<% if operatingsystem == "Fedora" then
+<% if @operatingsystem == "Fedora" then
# Fedora auto-mounts subsystems under /sys/fs/cgroup/ already, so no
# mount section is needed. %>
-<% elsif osfamily == "RedHat" then %>
+<% elsif @osfamily == "RedHat" then %>
mount {
cpuset = /cgroup/cpuset;
@@ -14,7 +14,7 @@ mount {
blkio = /cgroup/blkio;
}
-<% elsif ( operatingsystemrelease < '12.10' ) or ( operatingsystem != 'Ubuntu' ) then %>
+<% elsif ( @operatingsystemrelease < '12.10' ) or ( @operatingsystem != 'Ubuntu' ) then %>
mount {
cpu = /sys/fs/cgroup/cpu;
cpuacct = /sys/fs/cgroup/cpuacct;
@@ -49,13 +49,13 @@ group jenkins/children {
}
}
memory {
- memory.soft_limit_in_bytes = <%= (memorytotalbytes.to_f * 0.75).to_i %>;
- memory.limit_in_bytes = <%= (memorytotalbytes.to_f * 0.9).to_i %>;
-<% if (operatingsystem == "Fedora") and (operatingsystemrelease == "18") then
+ memory.soft_limit_in_bytes = <%= (@memorytotalbytes.to_f * 0.75).to_i %>;
+ memory.limit_in_bytes = <%= (@memorytotalbytes.to_f * 0.9).to_i %>;
+<% if (@operatingsystem == "Fedora") and (@operatingsystemrelease == "18") then
# Because of Red Hat bug 918951, swap management doesn't
# work in Fedora 18 but should be fixed in 19. %>
<% else %>
- memory.memsw.limit_in_bytes = <%= (memorytotalbytes.to_f * 0.9).to_i %>;
+ memory.memsw.limit_in_bytes = <%= (@memorytotalbytes.to_f * 0.9).to_i %>;
<% end %>
}
}
diff --git a/modules/logrotate/templates/config.erb b/modules/logrotate/templates/config.erb
index 58c8cf0031..619c2993e1 100644
--- a/modules/logrotate/templates/config.erb
+++ b/modules/logrotate/templates/config.erb
@@ -1,24 +1,24 @@
-<%= log %> {
-<% options.each do |opt| -%> <%= opt %>
+<%= @log %> {
+<% @options.each do |opt| -%> <%= opt %>
<% end -%>
-<% if prerotate != 'undef' -%>
+<% if @prerotate != 'undef' -%>
prerotate
- <%= prerotate %>
+ <%= @prerotate %>
endscript
<% end -%>
-<% if postrotate != 'undef' -%>
+<% if @postrotate != 'undef' -%>
postrotate
- <%= postrotate %>
+ <%= @postrotate %>
endscript
<% end -%>
-<% if firstaction != 'undef' -%>
+<% if @firstaction != 'undef' -%>
firstaction
- <%= firstaction %>
+ <%= @firstaction %>
endscript
<% end -%>
-<% if lastaction != 'undef' -%>
+<% if @lastaction != 'undef' -%>
lastaction
- <%= lastaction %>
+ <%= @lastaction %>
endscript
<% end -%>
}
diff --git a/modules/openstack_project/templates/jenkinsci-curl.erb b/modules/openstack_project/templates/jenkinsci-curl.erb
index d475bf8f8b..732bf10a9d 100644
--- a/modules/openstack_project/templates/jenkinsci-curl.erb
+++ b/modules/openstack_project/templates/jenkinsci-curl.erb
@@ -1 +1 @@
-user = "<%= jenkinsci_username %>:<%= jenkinsci_password %>"
+user = "<%= @jenkinsci_username %>:<%= @jenkinsci_password %>"
diff --git a/modules/openstack_project/templates/logs-dev.vhost.erb b/modules/openstack_project/templates/logs-dev.vhost.erb
index 0d12464002..371fd5231c 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 %>
+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}" %>
+<% 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>
@@ -63,8 +63,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
RewriteRule ^/(.*console\.html(\.gz)?)$ /htmlify/$1 [QSA,L,PT]
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/logs.vhost.erb b/modules/openstack_project/templates/logs.vhost.erb
index 0d12464002..b91de00e07 100644
--- a/modules/openstack_project/templates/logs.vhost.erb
+++ b/modules/openstack_project/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,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>
@@ -63,8 +63,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
RewriteRule ^/(.*console\.html(\.gz)?)$ /htmlify/$1 [QSA,L,PT]
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/mavencentral-curl.erb b/modules/openstack_project/templates/mavencentral-curl.erb
index 6beba5bdf2..5ea2ef4ed8 100644
--- a/modules/openstack_project/templates/mavencentral-curl.erb
+++ b/modules/openstack_project/templates/mavencentral-curl.erb
@@ -1 +1 @@
-user = "<%= mavencentral_username %>:<%= mavencentral_password %>"
+user = "<%= @mavencentral_username %>:<%= @mavencentral_password %>"
diff --git a/modules/openstack_project/templates/pbx/asterisk/sip.conf.erb b/modules/openstack_project/templates/pbx/asterisk/sip.conf.erb
index 9a544a6acc..e212129fcc 100644
--- a/modules/openstack_project/templates/pbx/asterisk/sip.conf.erb
+++ b/modules/openstack_project/templates/pbx/asterisk/sip.conf.erb
@@ -12,12 +12,12 @@ allow=ulaw
allow=alaw
allow=gsm
nat=force_rport,comedia
-<% sip_providers.each do |provider| -%>
+<% @sip_providers.each do |provider| -%>
register => <%= provider['username'] %>:<%= provider['password'] %>@<%= provider['hostname'] %>:5060
<% end -%>
-<% sip_providers.each do |provider| -%>
+<% @sip_providers.each do |provider| -%>
<% if provider['outgoing'] == true -%>
[<%= provider['username'] %>]
context=public
diff --git a/modules/openstack_project/templates/pypirc.erb b/modules/openstack_project/templates/pypirc.erb
index fbdd598e4d..2f1471ed9d 100644
--- a/modules/openstack_project/templates/pypirc.erb
+++ b/modules/openstack_project/templates/pypirc.erb
@@ -4,5 +4,5 @@ index-servers =
[pypi]
repository: https://pypi.python.org/pypi
-username: <%= pypi_username %>
-password: <%= pypi_password %>
+username: <%= @pypi_username %>
+password: <%= @pypi_password %>
diff --git a/modules/openstack_project/templates/transifexrc.erb b/modules/openstack_project/templates/transifexrc.erb
index 6166707331..34d9e6452c 100644
--- a/modules/openstack_project/templates/transifexrc.erb
+++ b/modules/openstack_project/templates/transifexrc.erb
@@ -1,5 +1,5 @@
[https://www.transifex.com]
hostname = https://www.transifex.com
-password = <%= transifex_password %>
+password = <%= @transifex_password %>
token =
-username = <%= transifex_username %>
+username = <%= @transifex_username %>
diff --git a/modules/recheckwatch/templates/recheckwatch.conf.erb b/modules/recheckwatch/templates/recheckwatch.conf.erb
index 454e8ee716..2eebb81484 100644
--- a/modules/recheckwatch/templates/recheckwatch.conf.erb
+++ b/modules/recheckwatch/templates/recheckwatch.conf.erb
@@ -7,7 +7,7 @@ closed_age=5 ; days
regex=(?i)^(?P<verb>recheck|reverify) (?:bug|lp)[\s#:]*(?P<bugno>\d+)$
[gerrit]
-host=<%= gerrit_server %>
-user=<%= gerrit_user %>
+host=<%= @gerrit_server %>
+user=<%= @gerrit_user %>
key=/var/lib/recheckwatch/ssh/id_rsa
port=29418
diff --git a/modules/salt/templates/minion.erb b/modules/salt/templates/minion.erb
index 6146fad6d9..c3ec2ed32c 100644
--- a/modules/salt/templates/minion.erb
+++ b/modules/salt/templates/minion.erb
@@ -7,7 +7,7 @@
# Set the location of the salt master server, if the master server cannot be
# resolved, then the minion will fail to start.
-master: <%= salt_master %>
+master: <%= @salt_master %>
# Set the port used by the master reply and authentication server
#master_port: 4506
diff --git a/modules/ulimit/templates/limits.erb b/modules/ulimit/templates/limits.erb
index db7fabc6d9..ff8bba63fc 100644
--- a/modules/ulimit/templates/limits.erb
+++ b/modules/ulimit/templates/limits.erb
@@ -1,2 +1,2 @@
# This file is managed by puppet. Manual changes will be ignored.
-<%= limit_domain %> <%= limit_type %> <%= limit_item %> <%= limit_value %>
+<%= @limit_domain %> <%= @limit_type %> <%= @limit_item %> <%= @limit_value %>
diff --git a/modules/unattended_upgrades/templates/50unattended-upgrades.erb b/modules/unattended_upgrades/templates/50unattended-upgrades.erb
index 2815768e78..b69f55ba6c 100644
--- a/modules/unattended_upgrades/templates/50unattended-upgrades.erb
+++ b/modules/unattended_upgrades/templates/50unattended-upgrades.erb
@@ -5,8 +5,8 @@ Unattended-Upgrade::Allowed-Origins {
"${distro_id} ${distro_codename}-security";
"${distro_id} ${distro_codename}-updates";
// "${distro_id} ${distro_codename}-proposed-updates";
-<% origins.each do |origin| -%>
- "<%= origin %>";
+<% @origins.each do |origin| -%>
+ "<%= @origin %>";
<% end -%>
};
diff --git a/modules/zuul/templates/zuul.conf.erb b/modules/zuul/templates/zuul.conf.erb
index 75534cad61..1fcb33ab19 100644
--- a/modules/zuul/templates/zuul.conf.erb
+++ b/modules/zuul/templates/zuul.conf.erb
@@ -1,13 +1,13 @@
[gearman]
-server=<%= gearman_server %>
+server=<%= @gearman_server %>
[gearman_server]
-start=<%= internal_gearman %>
+start=<%= @internal_gearman %>
log_config=/etc/zuul/gearman-logging.conf
[gerrit]
-server=<%= gerrit_server %>
-user=<%= gerrit_user %>
+server=<%= @gerrit_server %>
+user=<%= @gerrit_user %>
sshkey=/var/lib/zuul/ssh/id_rsa
[zuul]
@@ -15,37 +15,37 @@ layout_config=/etc/zuul/layout.yaml
log_config=/etc/zuul/logging.conf
state_dir=/var/lib/zuul
git_dir=/var/lib/zuul/git
-url_pattern=<%= url_pattern %>
-status_url=<%= status_url %>
-job_name_in_report=<%= job_name_in_report %>
-zuul_url=<%= zuul_url %>
+url_pattern=<%= @url_pattern %>
+status_url=<%= @status_url %>
+job_name_in_report=<%= @job_name_in_report %>
+zuul_url=<%= @zuul_url %>
[merger]
git_dir=/var/lib/zuul/git
-zuul_url=<%= zuul_url %>
+zuul_url=<%= @zuul_url %>
log_config=/etc/zuul/merger-logging.conf
-<% if git_email != "" -%>
-git_user_email=<%= git_email %>
+<% if @git_email != "" -%>
+git_user_email=<%= @git_email %>
<% end -%>
-<% if git_name != "" -%>
-git_user_name=<%= git_name %>
+<% if @git_name != "" -%>
+git_user_name=<%= @git_name %>
<% end -%>
-<% if swift_authurl != "" -%>
+<% if @swift_authurl != "" -%>
[swift]
-authurl=<%= swift_authurl %>
-user=<%= swift_user %>
-key=<%= swift_key %>
-tenant_name=<%= swift_tenant_name %>
-region_name=<%= swift_region_name %>
-default_container=<%= swift_default_container %>
-default_logserver_prefix=<%= swift_default_logserver_prefix %>
+authurl=<%= @swift_authurl %>
+user=<%= @swift_user %>
+key=<%= @swift_key %>
+tenant_name=<%= @swift_tenant_name %>
+region_name=<%= @swift_region_name %>
+default_container=<%= @swift_default_container %>
+default_logserver_prefix=<%= @swift_default_logserver_prefix %>
<% end -%>
-<% if smtp_host != "" -%>
+<% if @smtp_host != "" -%>
[smtp]
-server=<%= smtp_host %>
-port=<%= smtp_port %>
-default_from=<%= smtp_default_from %>
-default_to=<%= smtp_default_to %>
+server=<%= @smtp_host %>
+port=<%= @smtp_port %>
+default_from=<%= @smtp_default_from %>
+default_to=<%= @smtp_default_to %>
<% end -%>