Project

General

Profile

« Previous | Next » 

Revision 4393952b

Added by Ohad Levy over 12 years ago

remove environment name from the master section

View differences:

templates/puppet.conf.erb
report = true
pluginsync = true
environment = <%= environment %>
server = <%= puppetmaster %>
templates/server/puppet.conf.erb
reports = foreman
external_nodes = /etc/puppet/node.rb
node_terminus = exec
environment = production
<% if scope.lookupvar("puppet::params::git_repo") -%>
manifest = <%= scope.lookupvar("puppet::params::envs_dir") %>/$environment/manifests/site.pp
modulepath = <%= scope.lookupvar("puppet::params::envs_dir") %>/$environment/modules
<% else -%>
<% scope.lookupvar("puppet::params::environments").each do |env| -%>
<% scope.lookupvar("puppet::params::environments").each do |env| -%>
[<%= env %>]
modulepath = <%= scope.lookupvar("puppet::params::modules_path") %>/<%= env %>:<%= scope.lookupvar("puppet::paras::common_modules_path") %>
<% end -%>
<% end -%>
<% end -%>

Also available in: Unified diff