opendev/system-config
Code Issues Proposed changes

Fixing deprecation warnings

Browse Source 
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
This commit is contained in:
Spencer Krum 2014-06-18 15:44:01 -07:00 committed by Spencer Krum
parent 6247132dd0
commit 82b9b59522
28 changed files with 210 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/elasticsearch/templates/elasticsearch.default.erb
View File

@ -3,7 +3,7 @@
#ES_GROUP=elasticsearch #ES_GROUP=elasticsearch
# Heap Size (defaults to 256m min, 1g max) # Heap Size (defaults to 256m min, 1g max)
ES_HEAP_SIZE=<%= heap_size %> ES_HEAP_SIZE=<%= @heap_size %>
# Heap new generation # Heap new generation
#ES_HEAP_NEWSIZE= #ES_HEAP_NEWSIZE=

40
modules/elasticsearch/templates/elasticsearch.yml.erb
View File

@ -135,14 +135,14 @@ node.name: "<%= scope.lookupvar("::hostname") %>"
# Use the Index Status API (<http://localhost:9200/A/_status>) to inspect # Use the Index Status API (<http://localhost:9200/A/_status>) to inspect
# the index status. # the index status.
<% if es_template_config.has_key?('index.store.compress.stored') then -%> <% if @es_template_config.has_key?('index.store.compress.stored') then -%>
index.store.compress.stored: <%= es_template_config['index.store.compress.stored'] %> index.store.compress.stored: <%= @es_template_config['index.store.compress.stored'] %>
<% end -%> <% end -%>
<% if es_template_config.has_key?('index.store.compress.tv') then -%> <% if @es_template_config.has_key?('index.store.compress.tv') then -%>
index.store.compress.tv: <%= es_template_config['index.store.compress.tv'] %> index.store.compress.tv: <%= @es_template_config['index.store.compress.tv'] %>
<% end -%> <% end -%>
<% if es_template_config.has_key?('indices.memory.index_buffer_size') then -%> <% 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'] %>" indices.memory.index_buffer_size: "<%= @es_template_config['indices.memory.index_buffer_size'] %>"
<% end -%> <% end -%>
#################################### Paths #################################### #################################### 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: # Set this property to true to lock the memory:
# #
<% if es_template_config.has_key?('bootstrap.mlockall') then -%> <% if @es_template_config.has_key?('bootstrap.mlockall') then -%>
bootstrap.mlockall: <%= es_template_config['bootstrap.mlockall'] %> bootstrap.mlockall: <%= @es_template_config['bootstrap.mlockall'] %>
<% else -%> <% else -%>
# bootstrap.mlockall: true # bootstrap.mlockall: true
<% end -%> <% end -%>
@ -263,8 +263,8 @@ bootstrap.mlockall: <%= es_template_config['bootstrap.mlockall'] %>
# Allow recovery process after N nodes in a cluster are up: # Allow recovery process after N nodes in a cluster are up:
# #
<% if es_template_config.has_key?('gateway.recover_after_nodes') then -%> <% if @es_template_config.has_key?('gateway.recover_after_nodes') then -%>
gateway.recover_after_nodes: <%= es_template_config['gateway.recover_after_nodes'] %> gateway.recover_after_nodes: <%= @es_template_config['gateway.recover_after_nodes'] %>
<% else -%> <% else -%>
# gateway.recover_after_nodes: 1 # gateway.recover_after_nodes: 1
<% end -%> <% 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 # Set the timeout to initiate the recovery process, once the N nodes
# from previous setting are up (accepts time value): # from previous setting are up (accepts time value):
# #
<% if es_template_config.has_key?('gateway.recover_after_time') then -%> <% if @es_template_config.has_key?('gateway.recover_after_time') then -%>
gateway.recover_after_time: <%= es_template_config['gateway.recover_after_time'] %> gateway.recover_after_time: <%= @es_template_config['gateway.recover_after_time'] %>
<% else -%> <% else -%>
# gateway.recover_after_time: 5m # gateway.recover_after_time: 5m
<% end -%> <% 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 # are up (and recover_after_nodes is met), begin recovery process immediately
# (without waiting for recover_after_time to expire): # (without waiting for recover_after_time to expire):
# #
<% if es_template_config.has_key?('gateway.expected_nodes') then -%> <% if @es_template_config.has_key?('gateway.expected_nodes') then -%>
gateway.expected_nodes: <%= es_template_config['gateway.expected_nodes'] %> gateway.expected_nodes: <%= @es_template_config['gateway.expected_nodes'] %>
<% else -%> <% else -%>
# gateway.expected_nodes: 2 # gateway.expected_nodes: 2
<% end -%> <% 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) # operational within the cluster. Set this option to a higher value (2-4)
# for large clusters (>3 nodes): # for large clusters (>3 nodes):
# #
<% if es_template_config.has_key?('discovery.zen.minimum_master_nodes') then -%> <% 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'] %> discovery.zen.minimum_master_nodes: <%= @es_template_config['discovery.zen.minimum_master_nodes'] %>
<% else -%> <% else -%>
# discovery.zen.minimum_master_nodes: 1 # discovery.zen.minimum_master_nodes: 1
<% end -%> <% end -%>
@ -345,8 +345,8 @@ discovery.zen.minimum_master_nodes: <%= es_template_config['discovery.zen.minimu
# #
# 1. Disable multicast discovery (enabled by default): # 1. Disable multicast discovery (enabled by default):
# #
<% if es_template_config.has_key?('discovery.zen.ping.multicast.enabled') then -%> <% 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'] %> discovery.zen.ping.multicast.enabled: <%= @es_template_config['discovery.zen.ping.multicast.enabled'] %>
<% else -%> <% else -%>
# discovery.zen.ping.multicast.enabled: false # discovery.zen.ping.multicast.enabled: false
<% end -%> <% 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]"] # discovery.zen.ping.unicast.hosts: ["host1", "host2:port", "host3[portX-portY]"]
# #
<% if es_template_config.has_key?('discovery.zen.ping.unicast.hosts') then -%> <% 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("\", \"") %>"] discovery.zen.ping.unicast.hosts: ["<%= @es_template_config['discovery.zen.ping.unicast.hosts'].join("\", \"") %>"]
<% end -%> <% end -%>
# EC2 discovery allows to use AWS EC2 API in order to perform discovery. # EC2 discovery allows to use AWS EC2 API in order to perform discovery.

4
modules/exim/templates/aliases.erb
View File

@ -14,6 +14,6 @@ security: root
gerrit2: root gerrit2: root
jenkins: root jenkins: root
<% if sysadmin.length > 0 -%> <% if @sysadmin.length > 0 -%>
root: <%= sysadmin.join(",") %> root: <%= @sysadmin.join(",") %>
<% end -%> <% end -%>

2
modules/exim/templates/exim.sysconfig.erb
View File

@ -1,2 +1,2 @@
DAEMON=yes DAEMON=yes
QUEUE=<%= queue_interval %> QUEUE=<%= @queue_interval %>

20
modules/exim/templates/exim4.conf.erb
View File

@ -56,7 +56,7 @@ CONFDIR = <%= scope.lookupvar('exim::params::conf_dir') %>
# +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They
# are all colon-separated lists: # 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 = domainlist relay_to_domains =
hostlist relay_from_hosts = 127.0.0.1 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 # interlock with other processes, so additional queue runners can be
# started by other means, or by killing and restarting the daemon. # 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 # When this option is set, a delivery process is started whenever a
# message is received, routing is performed, and local deliveries take # 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 # to be queued in this way, and is equivalent to setting
# queue_smtp_domains to "*". See also hold_domains and queue_domains. # queue_smtp_domains to "*". See also hold_domains and queue_domains.
<% if queue_smtp_domains != "" -%> <% if @queue_smtp_domains != "" -%>
queue_smtp_domains = <%= queue_smtp_domains %> queue_smtp_domains = <%= @queue_smtp_domains %>
<% end %> <% end %>
<% if mailman_domains.length > 0 -%> <% if @mailman_domains.length > 0 -%>
# Home dir for your Mailman installation -- aka Mailman's prefix # Home dir for your Mailman installation -- aka Mailman's prefix
# directory. # directory.
MM_HOME=/var/lib/mailman MM_HOME=/var/lib/mailman
@ -330,7 +330,7 @@ MM_GID=list
# #
# Domains that your lists are in - colon separated list # Domains that your lists are in - colon separated list
# you may wish to add these into local_domains as well # 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 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 # Pick up on messages from our local mailman and route them via our
# special VERP-enabled transport # 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 # If the DNS lookup fails, no further routers are tried because of the no_more
# setting, and consequently the address is unrouteable. # setting, and consequently the address is unrouteable.
<% if smarthost -%> <% if @smarthost -%>
smarthost: smarthost:
driver = manualroute driver = manualroute
domains = !+local_domains domains = !+local_domains
transport = remote_smtp transport = remote_smtp
route_list = * <%= smarthost %> route_list = * <%= @smarthost %>
no_more no_more
<% else -%> <% else -%>
dnslookup: dnslookup:
@ -754,7 +754,7 @@ address_file:
address_reply: address_reply:
driver = autoreply driver = autoreply
<% if mailman_domains.length > 0 -%> <% if @mailman_domains.length > 0 -%>
mailman_transport: mailman_transport:
driver = pipe driver = pipe
command = MM_WRAP \ command = MM_WRAP \

2
modules/exim/templates/exim4.default.erb
View File

@ -10,7 +10,7 @@ EX4DEF_VERSION=''
# setting this to 'no' will also disable queueruns from /etc/ppp/ip-up.d/exim4 # setting this to 'no' will also disable queueruns from /etc/ppp/ip-up.d/exim4
QUEUERUNNER='combined' QUEUERUNNER='combined'
# how often should we run the queue # how often should we run the queue
QUEUEINTERVAL='<%= queue_interval %>' QUEUEINTERVAL='<%= @queue_interval %>'
# options common to quez-runner and listening daemon # options common to quez-runner and listening daemon
COMMONOPTIONS='' COMMONOPTIONS=''
# more options for the daemon/process running the queue (applies to the one # more options for the daemon/process running the queue (applies to the one

2
modules/gerrit/templates/contact_information.pub.erb
View File

@ -1 +1 @@
<%= contactstore_pubkey %> <%= @contactstore_pubkey %>

116
modules/gerrit/templates/gerrit.config.erb
View File

@ -3,90 +3,90 @@
[gerrit] [gerrit]
basePath = git basePath = git
canonicalWebUrl = <%= canonicalweburl %> canonicalWebUrl = <%= @canonicalweburl %>
[database] [database]
type = MYSQL type = MYSQL
hostname = <%= mysql_host %> hostname = <%= @mysql_host %>
database = reviewdb database = reviewdb
username = gerrit2 username = gerrit2
<% if database_poollimit != "" -%> <% if @database_poollimit != "" -%>
poolLimit = <%= database_poollimit %> poolLimit = <%= @database_poollimit %>
<% end -%> <% end -%>
connectionpool = true connectionpool = true
[auth] [auth]
<% if gerrit_contributor_agreement -%> <% if @gerrit_contributor_agreement -%>
contributorAgreements = true contributorAgreements = true
<% end -%> <% end -%>
type = <%= gerrit_auth_type %> type = <%= @gerrit_auth_type %>
cookieSecure = true cookieSecure = true
enableRunAs = true enableRunAs = true
<% if gerrit_auth_type == 'OPENID_SSO' -%> <% if @gerrit_auth_type == 'OPENID_SSO' -%>
openIdSsoUrl = <%= openidssourl %> openIdSsoUrl = <%= @openidssourl %>
<% end -%> <% end -%>
<% if gerrit_auth_type == 'LDAP' -%> <% if @gerrit_auth_type == 'LDAP' -%>
[ldap] [ldap]
server = <%= ldap_server %> server = <%= @ldap_server %>
accountBase = <%= ldap_account_base %> accountBase = <%= @ldap_account_base %>
<% if ldap_username -%>username = <%= ldap_username %><%end%> <% if @ldap_username -%>username = <%= @ldap_username %><%end%>
<% if ldap_password -%>password = <%= ldap_password %><%end%> <% if @ldap_password -%>password = <%= @ldap_password %><%end%>
<% if ldap_accountfullname -%>accountFullName = <%= ldap_accountfullname %><%end%> <% if @ldap_accountfullname -%>accountFullName = <%= @ldap_accountfullname %><%end%>
accountPattern = <%= ldap_account_pattern %> accountPattern = <%= @ldap_account_pattern %>
accountEmailAddress = <%= ldap_account_email_address %> accountEmailAddress = <%= @ldap_account_email_address %>
sslVerify = <%= ldap_sslverify %> sslVerify = <%= @ldap_sslverify %>
<% if @ldap_ssh_account_name -%>accountSshUserName = <%= ldap_ssh_account_name %><%end%> <% if @ldap_ssh_account_name -%>accountSshUserName = <%= @ldap_ssh_account_name %><%end%>
<% end %> <% end %>
[sendemail] [sendemail]
smtpServer = <%= smtpserver %> smtpServer = <%= @smtpserver %>
from = <%= sendemail_from %> from = <%= @sendemail_from %>
[container] [container]
user = gerrit2 user = gerrit2
javaHome = <%= java_home %> javaHome = <%= @java_home %>
<% if container_heaplimit != "" -%> <% if @container_heaplimit != "" -%>
heapLimit = <%= container_heaplimit %> heapLimit = <%= @container_heaplimit %>
<% end -%> <% end -%>
[core] [core]
<% if core_packedgitopenfiles != "" -%> <% if @core_packedgitopenfiles != "" -%>
packedGitOpenFiles = <%= core_packedgitopenfiles %> packedGitOpenFiles = <%= @core_packedgitopenfiles %>
<% end -%> <% end -%>
<% if core_packedgitlimit != "" -%> <% if @core_packedgitlimit != "" -%>
packedGitLimit = <%= core_packedgitlimit %> packedGitLimit = <%= @core_packedgitlimit %>
<% end -%> <% end -%>
<% if core_packedgitwindowsize != "" -%> <% if @core_packedgitwindowsize != "" -%>
packedGitWindowSize = <%= core_packedgitwindowsize %> packedGitWindowSize = <%= @core_packedgitwindowsize %>
<% end -%> <% end -%>
[sshd] [sshd]
listenAddress = <%= sshd_listen_address %> listenAddress = <%= @sshd_listen_address %>
<% if sshd_threads != "" -%> <% if @sshd_threads != "" -%>
threads = <%= sshd_threads %> threads = <%= @sshd_threads %>
<% end -%> <% end -%>
[httpd] [httpd]
listenUrl = proxy-https://*:8081/ listenUrl = proxy-https://*:8081/
<% if httpd_maxwait != "" -%> <% if @httpd_maxwait != "" -%>
maxWait = <%= httpd_maxwait %> maxWait = <%= @httpd_maxwait %>
<% end -%> <% end -%>
<% if httpd_acceptorthreads != "" -%> <% if @httpd_acceptorthreads != "" -%>
acceptorThreads = <%= httpd_acceptorthreads %> acceptorThreads = <%= @httpd_acceptorthreads %>
<% end -%> <% end -%>
<% if httpd_minthreads != "" -%> <% if @httpd_minthreads != "" -%>
minThreads = <%= httpd_minthreads %> minThreads = <%= @httpd_minthreads %>
<% end -%> <% end -%>
<% if httpd_maxthreads != "" -%> <% if @httpd_maxthreads != "" -%>
maxThreads = <%= httpd_maxthreads %> maxThreads = <%= @httpd_maxthreads %>
<% end -%> <% end -%>
[cache] [cache]
directory = cache directory = cache
[cache "web_sessions"] [cache "web_sessions"]
maxAge = 1d maxAge = 1d
[user] [user]
email = <%= email %> email = <%= @email %>
<% commentlinks.each do |commentlink| -%> <% @commentlinks.each do |commentlink| -%>
[commentlink "<%= commentlink['name'] %>"] [commentlink "<%= @commentlink['name'] %>"]
match = "<%= commentlink['match'] %>" match = "<%= @commentlink['match'] %>"
<% if commentlink['link'] != "" -%> <% if @commentlink['link'] != "" -%>
link = "<%= commentlink['link'] %>" link = "<%= @commentlink['link'] %>"
<% end -%> <% end -%>
<% if commentlink['html'] != "" -%> <% if @commentlink['html'] != "" -%>
html = "<%= commentlink['html'] %>" html = "<%= @commentlink['html'] %>"
<% end -%> <% end -%>
<% end -%> <% end -%>
[theme] [theme]
@ -99,13 +99,13 @@
tableOddRowColor = ffffff tableOddRowColor = ffffff
tableEvenRowColor = f5f5ff tableEvenRowColor = f5f5ff
[melody] [melody]
monitoring = <%= enable_melody %> monitoring = <%= @enable_melody %>
session = <%= melody_session %> session = <%= @melody_session %>
[plugin "javamelody"] [plugin "javamelody"]
allowTopMenu = <%= enable_javamelody_top_menu %> allowTopMenu = <%= @enable_javamelody_top_menu %>
<% if gitweb or cgit -%> <% if @gitweb or @cgit -%>
[gitweb] [gitweb]
<% if gitweb -%> <% if @gitweb -%>
revision = "?p=${project}.git;a=commitdiff;h=${commit}" revision = "?p=${project}.git;a=commitdiff;h=${commit}"
<% else -%> <% else -%>
type = cgit type = cgit
@ -114,14 +114,14 @@
url = "<%= scope.lookupvar('gerrit::web_repo_url') %>" url = "<%= scope.lookupvar('gerrit::web_repo_url') %>"
<% end -%> <% end -%>
<% end -%> <% end -%>
<% if contactstore == true -%> <% if @contactstore == true -%>
[contactstore] [contactstore]
appsec = <%= contactstore_appsec %> appsec = <%= @contactstore_appsec %>
url = <%= contactstore_url %> url = <%= @contactstore_url %>
<% end -%> <% end -%>
<% if secondary_index == true -%> <% if @secondary_index == true -%>
[index] [index]
type = <%= secondary_index_type %> type = <%= @secondary_index_type %>
<% end -%> <% end -%>
[mimetype "image/*"] [mimetype "image/*"]
safe = true safe = true

2
modules/gerrit/templates/replication.config.erb
View File

@ -1,7 +1,7 @@
# This file is managed by puppet. # This file is managed by puppet.
# https://git.openstack.org/cgit/openstack-infra/config # https://git.openstack.org/cgit/openstack-infra/config
<% replication.each do |replication| -%> <% @replication.each do |replication| -%>
[remote "<%= replication['name'] %>"] [remote "<%= replication['name'] %>"]
url = <%= replication['url'] %>${name}.git url = <%= replication['url'] %>${name}.git
<% if replication['replicationDelay'] != nil -%> <% if replication['replicationDelay'] != nil -%>

4
modules/gerrit/templates/secure.config.erb
View File

@ -1,4 +1,4 @@
[database] [database]
password = <%= mysql_password %> password = <%= @mysql_password %>
[auth] [auth]
registerEmailPrivateKey = <%= email_private_key %> registerEmailPrivateKey = <%= @email_private_key %>

10
modules/gerritbot/templates/gerritbot.config.erb
View File

@ -1,14 +1,14 @@
[ircbot] [ircbot]
nick=<%= nick %> nick=<%= @nick %>
pass=<%= password %> pass=<%= @password %>
server=<%= server %> server=<%= @server %>
port=6667 port=6667
channel_config=/etc/gerritbot/channel_config.yaml channel_config=/etc/gerritbot/channel_config.yaml
lockfile=/var/run/gerritbot/gerritbot.pid lockfile=/var/run/gerritbot/gerritbot.pid
log_config=/etc/gerritbot/logging.config log_config=/etc/gerritbot/logging.config
[gerrit] [gerrit]
user=<%= user %> user=<%= @user %>
key=/home/gerrit2/.ssh/gerritbot_rsa key=/home/gerrit2/.ssh/gerritbot_rsa
host=<%= vhost_name %> host=<%= @vhost_name %>
port=29418 port=29418

4
modules/github/templates/github-projects.secure.config.erb
View File

@ -1,3 +1,3 @@
[github] [github]
username = <%= project_username %> username = <%= @project_username %>
password = <%= project_password %> password = <%= @project_password %>

4
modules/github/templates/github.secure.config.erb
View File

@ -1,3 +1,3 @@
[github] [github]
username = <%= username %> username = <%= @username %>
oauth_token = <%= oauth_token %> oauth_token = <%= @oauth_token %>

16
modules/jeepyb/templates/openstackwatch.ini.erb
View File

@ -2,35 +2,35 @@
[general] [general]
# only show certain projects (don't forget the openstack/ as start) # 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. # 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 # Allow different mode to output to swift, by default 'combined' will
# combined all rss in one and 'multiple' will upload all the projects # combined all rss in one and 'multiple' will upload all the projects
# in each rss file. # in each rss file.
output_mode = <%= mode %> output_mode = <%= @mode %>
# username to your swift cluster # username to your swift cluster
[swift] [swift]
# username/tenant for swift with 2.0 or just username with 1.0 (i.e: # username/tenant for swift with 2.0 or just username with 1.0 (i.e:
# RAX). # RAX).
username = <%= swift_username %> username = <%= @swift_username %>
# password or api key # password or api key
password = <%= swift_password %> password = <%= @swift_password %>
# container to upload (probably want to be public) # container to upload (probably want to be public)
container = <%= container %> container = <%= @container %>
# auth_url of the cluster, for Rackspace this is : # auth_url of the cluster, for Rackspace this is :
# https://auth.api.rackspacecloud.com/v1.0 # https://auth.api.rackspacecloud.com/v1.0
# or Rackspace UK : # or Rackspace UK :
# https://lon.auth.api.rackspacecloud.com/v1.0 # 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 (1.0 for Rackspace clouds, 2.0 for keystone backend clusters)
auth_version = <%= auth_version %> auth_version = <%= @auth_version %>
# vim: ft=dosini # vim: ft=dosini

14
modules/jenkins/templates/cgconfig.erb
View File

@ -1,7 +1,7 @@
<% if operatingsystem == "Fedora" then <% if @operatingsystem == "Fedora" then
# Fedora auto-mounts subsystems under /sys/fs/cgroup/ already, so no # Fedora auto-mounts subsystems under /sys/fs/cgroup/ already, so no
# mount section is needed. %> # mount section is needed. %>
<% elsif osfamily == "RedHat" then %> <% elsif @osfamily == "RedHat" then %>
mount { mount {
cpuset = /cgroup/cpuset; cpuset = /cgroup/cpuset;
@ -14,7 +14,7 @@ mount {
blkio = /cgroup/blkio; blkio = /cgroup/blkio;
} }
<% elsif ( operatingsystemrelease < '12.10' ) or ( operatingsystem != 'Ubuntu' ) then %> <% elsif ( @operatingsystemrelease < '12.10' ) or ( @operatingsystem != 'Ubuntu' ) then %>
mount { mount {
cpu = /sys/fs/cgroup/cpu; cpu = /sys/fs/cgroup/cpu;
cpuacct = /sys/fs/cgroup/cpuacct; cpuacct = /sys/fs/cgroup/cpuacct;
@ -49,13 +49,13 @@ group jenkins/children {
} }
} }
memory { memory {
memory.soft_limit_in_bytes = <%= (memorytotalbytes.to_f * 0.75).to_i %>; memory.soft_limit_in_bytes = <%= (@memorytotalbytes.to_f * 0.75).to_i %>;
memory.limit_in_bytes = <%= (memorytotalbytes.to_f * 0.9).to_i %>; memory.limit_in_bytes = <%= (@memorytotalbytes.to_f * 0.9).to_i %>;
<% if (operatingsystem == "Fedora") and (operatingsystemrelease == "18") then <% if (@operatingsystem == "Fedora") and (@operatingsystemrelease == "18") then
# Because of Red Hat bug 918951, swap management doesn't # Because of Red Hat bug 918951, swap management doesn't
# work in Fedora 18 but should be fixed in 19. %> # work in Fedora 18 but should be fixed in 19. %>
<% else %> <% 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 %> <% end %>
} }
} }

20
modules/logrotate/templates/config.erb
View File

@ -1,24 +1,24 @@
<%= log %> { <%= @log %> {
<% options.each do |opt| -%> <%= opt %> <% @options.each do |opt| -%> <%= opt %>
<% end -%> <% end -%>
<% if prerotate != 'undef' -%> <% if @prerotate != 'undef' -%>
prerotate prerotate
<%= prerotate %> <%= @prerotate %>
endscript endscript
<% end -%> <% end -%>
<% if postrotate != 'undef' -%> <% if @postrotate != 'undef' -%>
postrotate postrotate
<%= postrotate %> <%= @postrotate %>
endscript endscript
<% end -%> <% end -%>
<% if firstaction != 'undef' -%> <% if @firstaction != 'undef' -%>
firstaction firstaction
<%= firstaction %> <%= @firstaction %>
endscript endscript
<% end -%> <% end -%>
<% if lastaction != 'undef' -%> <% if @lastaction != 'undef' -%>
lastaction lastaction
<%= lastaction %> <%= @lastaction %>
endscript endscript
<% end -%> <% end -%>
} }

2
modules/openstack_project/templates/jenkinsci-curl.erb
View File

@ -1 +1 @@
user = "<%= jenkinsci_username %>:<%= jenkinsci_password %>" user = "<%= @jenkinsci_username %>:<%= @jenkinsci_password %>"

38
modules/openstack_project/templates/logs-dev.vhost.erb
View File

@ -3,15 +3,15 @@
# Managed by Puppet # Managed by Puppet
# ************************************ # ************************************
NameVirtualHost <%= vhost_name %>:<%= port %> NameVirtualHost <%= @vhost_name %>:<%= @port %>
<VirtualHost <%= vhost_name %>:<%= port %>> <VirtualHost <%= @vhost_name %>:<%= @port %>>
ServerName <%= srvname %> ServerName <%= @srvname %>
<% if serveraliases.is_a? Array -%> <% if serveraliases.is_a? Array -%>
<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> <% serveraliases.each do |name| -%><%= " ServerAlias #{@name}\n" %><% end -%>
<% elsif serveraliases != '' -%> <% elsif @serveraliases != '' -%>
<%= " ServerAlias #{serveraliases}" %> <%= " ServerAlias #{@serveraliases}" %>
<% end -%> <% end -%>
DocumentRoot <%= docroot %> DocumentRoot <%= @docroot %>
# use Apache to compress the results afterwards, to save on the wire # 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 # it's approx 18x savings of wire traffic to compress. We need to
@ -23,37 +23,37 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
AddDefaultCharset UTF-8 AddDefaultCharset UTF-8
AddEncoding x-gzip gz AddEncoding x-gzip gz
</FilesMatch> </FilesMatch>
<Directory <%= docroot %>> <Directory <%= @docroot %>>
Options <%= options %> Options <%= @options %>
AllowOverride None AllowOverride None
Order allow,deny Order allow,deny
allow from all allow from all
</Directory> </Directory>
<Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*> <Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic*/*/*-tempest-dsvm*/*> <Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/> <Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/> <Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
# old patterns, can be removed in July 2014 # old patterns, can be removed in July 2014
<Directory <%= docroot %>/*/*/*/*/gate-tempest-devstack*/*> <Directory <%= @docroot %>/*/*/*/*/gate-tempest-devstack*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic/*/periodic-tempest-devstack*/*> <Directory <%= @docroot %>/periodic/*/periodic-tempest-devstack*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/*/*/*/*/gate-tempest-devstack*/*/logs/> <Directory <%= @docroot %>/*/*/*/*/gate-tempest-devstack*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic/*/periodic-tempest-devstack*/*/logs/> <Directory <%= @docroot %>/periodic/*/periodic-tempest-devstack*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
@ -63,8 +63,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
RewriteRule ^/(.*console\.html(\.gz)?)$ /htmlify/$1 [QSA,L,PT] RewriteRule ^/(.*console\.html(\.gz)?)$ /htmlify/$1 [QSA,L,PT]
WSGIScriptAlias /htmlify /usr/local/lib/python2.7/dist-packages/os_loganalyze/wsgi.py 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 LogLevel warn
CustomLog /var/log/apache2/<%= name %>_access.log combined CustomLog /var/log/apache2/<%= @name %>_access.log combined
ServerSignature Off ServerSignature Off
</VirtualHost> </VirtualHost>

40
modules/openstack_project/templates/logs.vhost.erb
View File

@ -3,15 +3,15 @@
# Managed by Puppet # Managed by Puppet
# ************************************ # ************************************
NameVirtualHost <%= vhost_name %>:<%= port %> NameVirtualHost <%= @vhost_name %>:<%= @port %>
<VirtualHost <%= vhost_name %>:<%= port %>> <VirtualHost <%= @vhost_name %>:<%= @port %>>
ServerName <%= srvname %> ServerName <%= @srvname %>
<% if serveraliases.is_a? Array -%> <% if @serveraliases.is_a? Array -%>
<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> <% @serveraliases.each do |name| -%><%= " ServerAlias #{@name}\n" %><% end -%>
<% elsif serveraliases != '' -%> <% elsif @serveraliases != '' -%>
<%= " ServerAlias #{serveraliases}" %> <%= " ServerAlias #{@serveraliases}" %>
<% end -%> <% end -%>
DocumentRoot <%= docroot %> DocumentRoot <%= @docroot %>
# use Apache to compress the results afterwards, to save on the wire # 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 # it's approx 18x savings of wire traffic to compress. We need to
@ -23,37 +23,37 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
AddDefaultCharset UTF-8 AddDefaultCharset UTF-8
AddEncoding x-gzip gz AddEncoding x-gzip gz
</FilesMatch> </FilesMatch>
<Directory <%= docroot %>> <Directory <%= @docroot %>>
Options <%= options %> Options <%= @options %>
AllowOverride None AllowOverride None
Order allow,deny Order allow,deny
allow from all allow from all
</Directory> </Directory>
<Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*> <Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic*/*/*-tempest-dsvm*/*> <Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/> <Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/> <Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
# old patterns, can be removed in July 2014 # old patterns, can be removed in July 2014
<Directory <%= docroot %>/*/*/*/*/gate-tempest-devstack*/*> <Directory <%= @docroot %>/*/*/*/*/gate-tempest-devstack*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic/*/periodic-tempest-devstack*/*> <Directory <%= @docroot %>/periodic/*/periodic-tempest-devstack*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/*/*/*/*/gate-tempest-devstack*/*/logs/> <Directory <%= @docroot %>/*/*/*/*/gate-tempest-devstack*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic/*/periodic-tempest-devstack*/*/logs/> <Directory <%= @docroot %>/periodic/*/periodic-tempest-devstack*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
@ -63,8 +63,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
RewriteRule ^/(.*console\.html(\.gz)?)$ /htmlify/$1 [QSA,L,PT] RewriteRule ^/(.*console\.html(\.gz)?)$ /htmlify/$1 [QSA,L,PT]
WSGIScriptAlias /htmlify /usr/local/lib/python2.7/dist-packages/os_loganalyze/wsgi.py 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 LogLevel warn
CustomLog /var/log/apache2/<%= name %>_access.log combined CustomLog /var/log/apache2/<%= @name %>_access.log combined
ServerSignature Off ServerSignature Off
</VirtualHost> </VirtualHost>

2
modules/openstack_project/templates/mavencentral-curl.erb
View File

@ -1 +1 @@
user = "<%= mavencentral_username %>:<%= mavencentral_password %>" user = "<%= @mavencentral_username %>:<%= @mavencentral_password %>"

4
modules/openstack_project/templates/pbx/asterisk/sip.conf.erb
View File

@ -12,12 +12,12 @@ allow=ulaw
allow=alaw allow=alaw
allow=gsm allow=gsm
nat=force_rport,comedia nat=force_rport,comedia
<% sip_providers.each do |provider| -%> <% @sip_providers.each do |provider| -%>
register => <%= provider['username'] %>:<%= provider['password'] %>@<%= provider['hostname'] %>:5060 register => <%= provider['username'] %>:<%= provider['password'] %>@<%= provider['hostname'] %>:5060
<% end -%> <% end -%>
<% sip_providers.each do |provider| -%> <% @sip_providers.each do |provider| -%>
<% if provider['outgoing'] == true -%> <% if provider['outgoing'] == true -%>
[<%= provider['username'] %>] [<%= provider['username'] %>]
context=public context=public

4
modules/openstack_project/templates/pypirc.erb
View File

@ -4,5 +4,5 @@ index-servers =
[pypi] [pypi]
repository: https://pypi.python.org/pypi repository: https://pypi.python.org/pypi
username: <%= pypi_username %> username: <%= @pypi_username %>
password: <%= pypi_password %> password: <%= @pypi_password %>

4
modules/openstack_project/templates/transifexrc.erb
View File

@ -1,5 +1,5 @@
[https://www.transifex.com] [https://www.transifex.com]
hostname = https://www.transifex.com hostname = https://www.transifex.com
password = <%= transifex_password %> password = <%= @transifex_password %>
token = token =
username = <%= transifex_username %> username = <%= @transifex_username %>

4
modules/recheckwatch/templates/recheckwatch.conf.erb
View File

@ -7,7 +7,7 @@ closed_age=5 ; days
regex=(?i)^(?P<verb>recheck|reverify) (?:bug|lp)[\s#:]*(?P<bugno>\d+)$ regex=(?i)^(?P<verb>recheck|reverify) (?:bug|lp)[\s#:]*(?P<bugno>\d+)$
[gerrit] [gerrit]
host=<%= gerrit_server %> host=<%= @gerrit_server %>
user=<%= gerrit_user %> user=<%= @gerrit_user %>
key=/var/lib/recheckwatch/ssh/id_rsa key=/var/lib/recheckwatch/ssh/id_rsa
port=29418 port=29418

2
modules/salt/templates/minion.erb
View File

@ -7,7 +7,7 @@
# Set the location of the salt master server, if the master server cannot be # Set the location of the salt master server, if the master server cannot be
# resolved, then the minion will fail to start. # 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 # Set the port used by the master reply and authentication server
#master_port: 4506 #master_port: 4506

2
modules/ulimit/templates/limits.erb
View File

@ -1,2 +1,2 @@
# This file is managed by puppet. Manual changes will be ignored. # 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 %>

4
modules/unattended_upgrades/templates/50unattended-upgrades.erb
View File

@ -5,8 +5,8 @@ Unattended-Upgrade::Allowed-Origins {
"${distro_id} ${distro_codename}-security"; "${distro_id} ${distro_codename}-security";
"${distro_id} ${distro_codename}-updates"; "${distro_id} ${distro_codename}-updates";
// "${distro_id} ${distro_codename}-proposed-updates"; // "${distro_id} ${distro_codename}-proposed-updates";
<% origins.each do |origin| -%> <% @origins.each do |origin| -%>
"<%= origin %>"; "<%= @origin %>";
<% end -%> <% end -%>
}; };

52
modules/zuul/templates/zuul.conf.erb
View File

@ -1,13 +1,13 @@
[gearman] [gearman]
server=<%= gearman_server %> server=<%= @gearman_server %>
[gearman_server] [gearman_server]
start=<%= internal_gearman %> start=<%= @internal_gearman %>
log_config=/etc/zuul/gearman-logging.conf log_config=/etc/zuul/gearman-logging.conf
[gerrit] [gerrit]
server=<%= gerrit_server %> server=<%= @gerrit_server %>
user=<%= gerrit_user %> user=<%= @gerrit_user %>
sshkey=/var/lib/zuul/ssh/id_rsa sshkey=/var/lib/zuul/ssh/id_rsa
[zuul] [zuul]
@ -15,37 +15,37 @@ layout_config=/etc/zuul/layout.yaml
log_config=/etc/zuul/logging.conf log_config=/etc/zuul/logging.conf
state_dir=/var/lib/zuul state_dir=/var/lib/zuul
git_dir=/var/lib/zuul/git git_dir=/var/lib/zuul/git
url_pattern=<%= url_pattern %> url_pattern=<%= @url_pattern %>
status_url=<%= status_url %> status_url=<%= @status_url %>
job_name_in_report=<%= job_name_in_report %> job_name_in_report=<%= @job_name_in_report %>
zuul_url=<%= zuul_url %> zuul_url=<%= @zuul_url %>
[merger] [merger]
git_dir=/var/lib/zuul/git git_dir=/var/lib/zuul/git
zuul_url=<%= zuul_url %> zuul_url=<%= @zuul_url %>
log_config=/etc/zuul/merger-logging.conf log_config=/etc/zuul/merger-logging.conf
<% if git_email != "" -%> <% if @git_email != "" -%>
git_user_email=<%= git_email %> git_user_email=<%= @git_email %>
<% end -%> <% end -%>
<% if git_name != "" -%> <% if @git_name != "" -%>
git_user_name=<%= git_name %> git_user_name=<%= @git_name %>
<% end -%> <% end -%>
<% if swift_authurl != "" -%> <% if @swift_authurl != "" -%>
[swift] [swift]
authurl=<%= swift_authurl %> authurl=<%= @swift_authurl %>
user=<%= swift_user %> user=<%= @swift_user %>
key=<%= swift_key %> key=<%= @swift_key %>
tenant_name=<%= swift_tenant_name %> tenant_name=<%= @swift_tenant_name %>
region_name=<%= swift_region_name %> region_name=<%= @swift_region_name %>
default_container=<%= swift_default_container %> default_container=<%= @swift_default_container %>
default_logserver_prefix=<%= swift_default_logserver_prefix %> default_logserver_prefix=<%= @swift_default_logserver_prefix %>
<% end -%> <% end -%>
<% if smtp_host != "" -%> <% if @smtp_host != "" -%>
[smtp] [smtp]
server=<%= smtp_host %> server=<%= @smtp_host %>
port=<%= smtp_port %> port=<%= @smtp_port %>
default_from=<%= smtp_default_from %> default_from=<%= @smtp_default_from %>
default_to=<%= smtp_default_to %> default_to=<%= @smtp_default_to %>
<% end -%> <% end -%>