recommit for updates in build 59
This commit is contained in:
@@ -158,7 +158,7 @@ class puppet_cd::main::files (
|
|||||||
owner => 'root',
|
owner => 'root',
|
||||||
group => 'root',
|
group => 'root',
|
||||||
mode => '0644',
|
mode => '0644',
|
||||||
content => template($pt_puppet_conf_erb),
|
content => template($pt_agent_conf_erb),
|
||||||
notify => Service[$pt_agent_service],
|
notify => Service[$pt_agent_service],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1315,7 +1315,8 @@ considered a puppet agent.</p>
|
|||||||
166
|
166
|
||||||
167
|
167
|
||||||
168
|
168
|
||||||
169</pre>
|
169
|
||||||
|
170</pre>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 32</span>
|
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 32</span>
|
||||||
@@ -1429,6 +1430,7 @@ class puppet_cd::params (
|
|||||||
## puppet
|
## puppet
|
||||||
$pt_puppet_conf_file = "${pt_puppetdir}/puppet.conf"
|
$pt_puppet_conf_file = "${pt_puppetdir}/puppet.conf"
|
||||||
$pt_puppet_conf_erb = 'puppet_cd/puppet.conf.erb'
|
$pt_puppet_conf_erb = 'puppet_cd/puppet.conf.erb'
|
||||||
|
$pt_agent_conf_erb = 'puppet_cd/agent.conf.erb'
|
||||||
$pt_hiera_config = "${pt_puppetdir}/hiera.yaml"
|
$pt_hiera_config = "${pt_puppetdir}/hiera.yaml"
|
||||||
## puppetdb
|
## puppetdb
|
||||||
$pt_bootstrap_conf = "${pt_puppetdb_main}/bootstrap.cfg"
|
$pt_bootstrap_conf = "${pt_puppetdb_main}/bootstrap.cfg"
|
||||||
|
|||||||
Reference in New Issue
Block a user