diff --git a/dns/manifests/init.pp b/dns/manifests/init.pp index 6978122..e7d6033 100644 --- a/dns/manifests/init.pp +++ b/dns/manifests/init.pp @@ -569,7 +569,7 @@ class dns::node { } 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 { $dns_node_cname = "" } @@ -581,9 +581,9 @@ class dns::node { tag => $dns_node_zone } - $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_rzone = inline_template("<%= dns_node_ipaddr.split('.').reverse.last(dns_node_class.to_i).join('.') -%>.in-addr.arpa") + $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_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}": ipaddr => $dns_node_raddr, diff --git a/kerberos/manifests/init.pp b/kerberos/manifests/init.pp index f368b8f..c629b71 100644 --- a/kerberos/manifests/init.pp +++ b/kerberos/manifests/init.pp @@ -77,7 +77,7 @@ class kerberos::auth { include pam::common include kerberos::client - $kdclist = inline_template('<%= kerberos_kdc.join(" ") -%>') + $kdclist = inline_template('<%= @kerberos_kdc.join(" ") -%>') case $::operatingsystem { "centos","redhat","fedora": { diff --git a/ldap/manifests/init.pp b/ldap/manifests/init.pp index fa6d768..0f8200b 100644 --- a/ldap/manifests/init.pp +++ b/ldap/manifests/init.pp @@ -18,7 +18,7 @@ class ldap::auth inherits ldap::client { tag("bootstrap") - $ldap_uri = inline_template('<%= ldap_server.join(" ") -%>') + $ldap_uri = inline_template('<%= @ldap_server.join(" ") -%>') case $::operatingsystem { "centos","redhat": { diff --git a/nagios/manifests/init.pp b/nagios/manifests/init.pp index 51e6311..107179e 100644 --- a/nagios/manifests/init.pp +++ b/nagios/manifests/init.pp @@ -308,7 +308,7 @@ class nagios::server inherits nagios::server::manual { define nagios::contact::email($group=["all"], $confdir=$nagios::common::confdir) { - $contactgroups = inline_template('<%= group.join(",") -%>') + $contactgroups = inline_template('<%= @group.join(",") -%>') file { "${confdir}/contact_${name}.cfg": ensure => present, @@ -346,7 +346,7 @@ define nagios::contact::email($group=["all"], define nagios::contact::prowl($group=["all"], $confdir=$nagios::common::confdir) { - $contactgroups = inline_template('<%= group.join(",") -%>') + $contactgroups = inline_template('<%= @group.join(",") -%>') file { "${confdir}/contact_prowl_${name}.cfg": ensure => present, @@ -386,7 +386,7 @@ define nagios::contact::prowl($group=["all"], define nagios::contact::pushover($token, $group=["all"], $confdir=$nagios::common::confdir) { - $contactgroups = inline_template('<%= group.join(",") -%>') + $contactgroups = inline_template('<%= @group.join(",") -%>') file { "${confdir}/contact_pushover_${name}.cfg": ensure => present, @@ -448,7 +448,7 @@ define nagios::host($address=undef, $group="NONE", $osname="NONE", use => "default", target => "${confdir}/host_${name}.cfg", parents => is_array($parent) ? { - true => inline_template('<%= parent.join(",") -%>'), + true => inline_template('<%= @parent.join(",") -%>'), false => $parent, }, notify => Service["nagios"], diff --git a/nagios/manifests/target.pp b/nagios/manifests/target.pp index a485abf..6595056 100644 --- a/nagios/manifests/target.pp +++ b/nagios/manifests/target.pp @@ -27,7 +27,7 @@ class nagios::target($parent=undef) { osname => $::operatingsystem, osicon => $::osfamily ? { "" => "NONE", - default => inline_template("<%= osfamily.downcase %>") + default => inline_template("<%= @osfamily.downcase %>") }, parent => $parent, } diff --git a/network/templates/ifcfg-if.erb b/network/templates/ifcfg-if.erb index 3e82c79..c5e8db1 100644 --- a/network/templates/ifcfg-if.erb +++ b/network/templates/ifcfg-if.erb @@ -1,9 +1,9 @@ DEVICE=<%= @name %> -<% if @name !~ /(bond|br)[0-9]/ && has_variable?("macaddress_" + name) -%> -HWADDR=<%= scope.lookupvar("macaddress_" + name) %> +<% if @name !~ /(bond|br)[0-9]/ && has_variable?("macaddress_" + @name) -%> +HWADDR=<%= scope.lookupvar("macaddress_" + @name) %> <% end -%> ONBOOT=yes -BOOTPROTO=<%= proto %> +BOOTPROTO=<%= @proto %> <% if @ipaddr != 'none' and @ipaddr != 'dhcp' -%> IPADDR=<%= @ipaddr %> <% end -%> diff --git a/ssh/manifests/init.pp b/ssh/manifests/init.pp index a8947b9..5669fb8 100644 --- a/ssh/manifests/init.pp +++ b/ssh/manifests/init.pp @@ -12,7 +12,7 @@ class ssh::known_hosts { }, } - $aliases = merge(inline_template("<%= homename.split('.')[0] %>"), + $aliases = merge(inline_template("<%= @homename.split('.')[0] %>"), $::ipaddress, $::ipaddress6, $::ec2_public_ipv4) @@ -167,7 +167,7 @@ class 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 { $ssh_allowgroups_real = $root_group } diff --git a/syslog/manifests/init.pp b/syslog/manifests/init.pp index 846a3d0..d9acab9 100644 --- a/syslog/manifests/init.pp +++ b/syslog/manifests/init.pp @@ -283,7 +283,7 @@ class syslog::common::standalone inherits syslog::common { default => "root", }, } - $syslog_rotate_files = inline_template('<%= syslog_rotate.join(" ") -%>') + $syslog_rotate_files = inline_template('<%= @syslog_rotate.join(" ") -%>') cron { "logarchiver.sh": command => "/usr/local/sbin/logarchiver.sh ${syslog_rotate_files} >/dev/null", user => "root", diff --git a/yum/manifests/init.pp b/yum/manifests/init.pp index 59b4552..67ea3bd 100644 --- a/yum/manifests/init.pp +++ b/yum/manifests/init.pp @@ -125,7 +125,7 @@ class 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": context => "/files/etc/yum.conf/main",