tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More instance variable cleanup

Browse source
This commit is contained in:
Ossi Salmi 2013-05-24 10:29:11 +03:00
parent 49a8ae3004
commit 0e4f99b1bc
9 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dns/manifests/init.pp
View file

@ -569,7 +569,7 @@ class dns::node {
} }
if $dns_node_alias { if $dns_node_alias {
$dns_node_cname = inline_template("<% dns_node_alias.each do |a| -%><%= a %>\tIN\tCNAME\t<%= dns_node_name %>\n<% end -%>") $dns_node_cname = inline_template("<% @dns_node_alias.each do |a| -%><%= a %>\tIN\tCNAME\t<%= @dns_node_name %>\n<% end -%>")
} else { } else {
$dns_node_cname = "" $dns_node_cname = ""
} }
@ -581,9 +581,9 @@ class dns::node {
tag => $dns_node_zone tag => $dns_node_zone
} }
$dns_node_class = inline_template("<%= dns_node_netmask.scan('255.').length -%>") $dns_node_class = inline_template("<%= @dns_node_netmask.scan('255.').length -%>")
$dns_node_raddr = inline_template("<%= dns_node_ipaddr.split('.').reverse.first(4-dns_node_class.to_i).join('.') -%>") $dns_node_raddr = inline_template("<%= @dns_node_ipaddr.split('.').reverse.first(4-@dns_node_class.to_i).join('.') -%>")
$dns_node_rzone = inline_template("<%= dns_node_ipaddr.split('.').reverse.last(dns_node_class.to_i).join('.') -%>.in-addr.arpa") $dns_node_rzone = inline_template("<%= @dns_node_ipaddr.split('.').reverse.last(@dns_node_class.to_i).join('.') -%>.in-addr.arpa")
@@dns::node::record::reverse { "${dns_node_name}.${dns_node_zone}": @@dns::node::record::reverse { "${dns_node_name}.${dns_node_zone}":
ipaddr => $dns_node_raddr, ipaddr => $dns_node_raddr,

2
kerberos/manifests/init.pp
View file

@ -77,7 +77,7 @@ class kerberos::auth {
include pam::common include pam::common
include kerberos::client include kerberos::client
$kdclist = inline_template('<%= kerberos_kdc.join(" ") -%>') $kdclist = inline_template('<%= @kerberos_kdc.join(" ") -%>')
case $::operatingsystem { case $::operatingsystem {
"centos","redhat","fedora": { "centos","redhat","fedora": {

2
ldap/manifests/init.pp
View file

@ -18,7 +18,7 @@ class ldap::auth inherits ldap::client {
tag("bootstrap") tag("bootstrap")
$ldap_uri = inline_template('<%= ldap_server.join(" ") -%>') $ldap_uri = inline_template('<%= @ldap_server.join(" ") -%>')
case $::operatingsystem { case $::operatingsystem {
"centos","redhat": { "centos","redhat": {

8
nagios/manifests/init.pp
View file

@ -308,7 +308,7 @@ class nagios::server inherits nagios::server::manual {
define nagios::contact::email($group=["all"], define nagios::contact::email($group=["all"],
$confdir=$nagios::common::confdir) { $confdir=$nagios::common::confdir) {
$contactgroups = inline_template('<%= group.join(",") -%>') $contactgroups = inline_template('<%= @group.join(",") -%>')
file { "${confdir}/contact_${name}.cfg": file { "${confdir}/contact_${name}.cfg":
ensure => present, ensure => present,
@ -346,7 +346,7 @@ define nagios::contact::email($group=["all"],
define nagios::contact::prowl($group=["all"], define nagios::contact::prowl($group=["all"],
$confdir=$nagios::common::confdir) { $confdir=$nagios::common::confdir) {
$contactgroups = inline_template('<%= group.join(",") -%>') $contactgroups = inline_template('<%= @group.join(",") -%>')
file { "${confdir}/contact_prowl_${name}.cfg": file { "${confdir}/contact_prowl_${name}.cfg":
ensure => present, ensure => present,
@ -386,7 +386,7 @@ define nagios::contact::prowl($group=["all"],
define nagios::contact::pushover($token, $group=["all"], define nagios::contact::pushover($token, $group=["all"],
$confdir=$nagios::common::confdir) { $confdir=$nagios::common::confdir) {
$contactgroups = inline_template('<%= group.join(",") -%>') $contactgroups = inline_template('<%= @group.join(",") -%>')
file { "${confdir}/contact_pushover_${name}.cfg": file { "${confdir}/contact_pushover_${name}.cfg":
ensure => present, ensure => present,
@ -448,7 +448,7 @@ define nagios::host($address=undef, $group="NONE", $osname="NONE",
use => "default", use => "default",
target => "${confdir}/host_${name}.cfg", target => "${confdir}/host_${name}.cfg",
parents => is_array($parent) ? { parents => is_array($parent) ? {
true => inline_template('<%= parent.join(",") -%>'), true => inline_template('<%= @parent.join(",") -%>'),
false => $parent, false => $parent,
}, },
notify => Service["nagios"], notify => Service["nagios"],

2
nagios/manifests/target.pp
View file

@ -27,7 +27,7 @@ class nagios::target($parent=undef) {
osname => $::operatingsystem, osname => $::operatingsystem,
osicon => $::osfamily ? { osicon => $::osfamily ? {
"" => "NONE", "" => "NONE",
default => inline_template("<%= osfamily.downcase %>") default => inline_template("<%= @osfamily.downcase %>")
}, },
parent => $parent, parent => $parent,
} }

6
network/templates/ifcfg-if.erb
View file

@ -1,9 +1,9 @@
DEVICE=<%= @name %> DEVICE=<%= @name %>
<% if @name !~ /(bond|br)[0-9]/ && has_variable?("macaddress_" + name) -%> <% if @name !~ /(bond|br)[0-9]/ && has_variable?("macaddress_" + @name) -%>
HWADDR=<%= scope.lookupvar("macaddress_" + name) %> HWADDR=<%= scope.lookupvar("macaddress_" + @name) %>
<% end -%> <% end -%>
ONBOOT=yes ONBOOT=yes
BOOTPROTO=<%= proto %> BOOTPROTO=<%= @proto %>
<% if @ipaddr != 'none' and @ipaddr != 'dhcp' -%> <% if @ipaddr != 'none' and @ipaddr != 'dhcp' -%>
IPADDR=<%= @ipaddr %> IPADDR=<%= @ipaddr %>
<% end -%> <% end -%>

4
ssh/manifests/init.pp
View file

@ -12,7 +12,7 @@ class ssh::known_hosts {
}, },
} }
$aliases = merge(inline_template("<%= homename.split('.')[0] %>"), $aliases = merge(inline_template("<%= @homename.split('.')[0] %>"),
$::ipaddress, $::ipaddress,
$::ipaddress6, $::ipaddress6,
$::ec2_public_ipv4) $::ec2_public_ipv4)
@ -167,7 +167,7 @@ class ssh::allowgroups {
} }
if $ssh_allowgroups { if $ssh_allowgroups {
$ssh_allowgroups_real = inline_template("${root_group} <%= ssh_allowgroups.join(' ') %>") $ssh_allowgroups_real = inline_template("${root_group} <%= @ssh_allowgroups.join(' ') %>")
} else { } else {
$ssh_allowgroups_real = $root_group $ssh_allowgroups_real = $root_group
} }

2
syslog/manifests/init.pp
View file

@ -283,7 +283,7 @@ class syslog::common::standalone inherits syslog::common {
default => "root", default => "root",
}, },
} }
$syslog_rotate_files = inline_template('<%= syslog_rotate.join(" ") -%>') $syslog_rotate_files = inline_template('<%= @syslog_rotate.join(" ") -%>')
cron { "logarchiver.sh": cron { "logarchiver.sh":
command => "/usr/local/sbin/logarchiver.sh ${syslog_rotate_files} >/dev/null", command => "/usr/local/sbin/logarchiver.sh ${syslog_rotate_files} >/dev/null",
user => "root", user => "root",

2
yum/manifests/init.pp
View file

@ -125,7 +125,7 @@ class yum::exclude {
fail("\$yum_exclude must be defined for yum::exclude") fail("\$yum_exclude must be defined for yum::exclude")
} }
$yum_exclude_real = inline_template('<%= yum_exclude.join(" ") -%>') $yum_exclude_real = inline_template('<%= @yum_exclude.join(" ") -%>')
augeas { "yum-exclude": augeas { "yum-exclude":
context => "/files/etc/yum.conf/main", context => "/files/etc/yum.conf/main",