Puppet users - Oct 2014 - Getting the last of site specific data out of manifest

I'm using OS Puppet 3.7.1.  I'm using Hiera and *mostly* have our site
specific data out of our modules.

I could use some advice on how to handle the following two cases.

Case #1

node basenode {
  include files   # files common to all nodes
}

node 'hostname.example.com' inherits basenode {
  include files::hostname  # files specific to host
}

Case #2

In template files, flow control like:

<% if (hostname == "hostname1") -%>
X11Forwarding yes
<% else -%>
X11Forwarding no
<% end -%>

Any advice appreciated.

Thanks,

-- 
Kent Brede

-- 
You received this message because you are subscribed to the Google Groups
"Puppet Users" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to puppet-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/puppet-users/CA%2BnSE3_5QCHnNb2utzZwA8c1oobRGbOazoJEWYJcigMqgLyydA%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.