Skip to content
Snippets Groups Projects
Commit 25b13fcb authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

fix more @ issues in ERB files

parent e49a0e30
No related branches found
No related tags found
No related merge requests found
UNRELEASED (2015-03-??)
Fix a few more deprecation warnings concering instance variables
(i.e., add '@'s in ERB files) (adamhl)
release/004.031 (2015-03-02) release/004.031 (2015-03-02)
Beginning of work to support RHEL-ish operating systems Beginning of work to support RHEL-ish operating systems
such as CentOS and Oracle Linux. The most common change such as CentOS and Oracle Linux. The most common change
involves converting 'operatingsystem' variable/fact usage involves converting 'operatingsystem' variable/fact usage
to 'osfamily'. These changes were made safely as not to to 'osfamily'. These changes were made safely as not to
potentially affect any existing hosts. There may be some potentially affect any existing hosts. There may be some
additional refinements when CentOS and Oracle hosts come additional refinements when CentOS and Oracle hosts come
online; for now, we're assuming they act identical to RHEL. online; for now, we're assuming they act identical to RHEL.
Additionally modified puppetclient.pp to support version Additionally modified puppetclient.pp to support version
locking of puppet and facter versions on RHEL systems. locking of puppet and facter versions on RHEL systems.
Added one additional manifest to facilitate this. Added one additional manifest to facilitate this.
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
[realms] [realms]
stanford.edu = { stanford.edu = {
<% if drSite == "yes" %> kdc = kerberos-liv.stanford.edu:88 <% if @drSite == "yes" %> kdc = kerberos-liv.stanford.edu:88
<% end %> kdc = krb5auth1.stanford.edu:88 <% end %> kdc = krb5auth1.stanford.edu:88
kdc = krb5auth2.stanford.edu:88 kdc = krb5auth2.stanford.edu:88
kdc = krb5auth3.stanford.edu:88 kdc = krb5auth3.stanford.edu:88
......
...@@ -5,7 +5,7 @@ set save = <%= @directory %>/OLD/%n ...@@ -5,7 +5,7 @@ set save = <%= @directory %>/OLD/%n
set archive = <%= @archive %>/%Y/%M/%d/%m.%n set archive = <%= @archive %>/%Y/%M/%d/%m.%n
<% end -%> <% end -%>
<%= name %> { <%= @name %> {
<% if @stop != '' then -%> <% if @stop != '' then -%>
stop: <%= @stop %> stop: <%= @stop %>
<% end -%> <% end -%>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
host = @fqdn.downcase host = @fqdn.downcase
product = productname rescue nil product = @productname rescue nil
if product.nil? if product.nil?
product = "unknown" product = "unknown"
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment