Recommit for updates in build 70
This commit is contained in:
@@ -141,7 +141,18 @@
|
|||||||
43
|
43
|
||||||
44
|
44
|
||||||
45
|
45
|
||||||
46</pre>
|
46
|
||||||
|
47
|
||||||
|
48
|
||||||
|
49
|
||||||
|
50
|
||||||
|
51
|
||||||
|
52
|
||||||
|
53
|
||||||
|
54
|
||||||
|
55
|
||||||
|
56
|
||||||
|
57</pre>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
|
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
|
||||||
@@ -185,6 +196,17 @@ class puppet_cd::main::files (
|
|||||||
content => template($pt_puppetdb_conf_erb),
|
content => template($pt_puppetdb_conf_erb),
|
||||||
# notify => Service[$pt_agent_service,$pt_server_service],
|
# notify => Service[$pt_agent_service,$pt_server_service],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# fix service file syslog vs journald
|
||||||
|
file { $pt_puppetdb_service_file:
|
||||||
|
ensure => file,
|
||||||
|
path => $pt_puppetdb_service_file,
|
||||||
|
owner => 'root',
|
||||||
|
group => 'root',
|
||||||
|
mode => '0644',
|
||||||
|
content => template($pt_puppetdb_service_erb),
|
||||||
|
notify => Service[$pt_db_service],
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}</pre>
|
}</pre>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -180,7 +180,7 @@
|
|||||||
<span class='type'>(<tt>String</tt>)</span>
|
<span class='type'>(<tt>String</tt>)</span>
|
||||||
|
|
||||||
|
|
||||||
<em class="default">(defaults to: <tt>'present'</tt>)</em>
|
<em class="default">(defaults to: <tt>'latest'</tt>)</em>
|
||||||
|
|
||||||
|
|
||||||
—
|
—
|
||||||
@@ -1694,7 +1694,9 @@
|
|||||||
247
|
247
|
||||||
248
|
248
|
||||||
249
|
249
|
||||||
250</pre>
|
250
|
||||||
|
251
|
||||||
|
252</pre>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 89</span>
|
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 89</span>
|
||||||
@@ -1706,7 +1708,7 @@ class puppet_cd::params (
|
|||||||
String $pt_db_fqdn = 'puppetdb.example.net',
|
String $pt_db_fqdn = 'puppetdb.example.net',
|
||||||
|
|
||||||
# installation
|
# installation
|
||||||
String $pt_pkg_ensure = 'present',
|
String $pt_pkg_ensure = 'latest',
|
||||||
String $pt_agent_pkg = 'puppet-agent',
|
String $pt_agent_pkg = 'puppet-agent',
|
||||||
String $pt_server_pkg = 'puppetserver',
|
String $pt_server_pkg = 'puppetserver',
|
||||||
Array $pt_db_pkg = ['puppetdb','puppetdb-termini'],
|
Array $pt_db_pkg = ['puppetdb','puppetdb-termini'],
|
||||||
@@ -1844,6 +1846,8 @@ class puppet_cd::params (
|
|||||||
$pt_puppetdb_conf_erb = 'puppet_cd/puppetdb/puppetdb.conf.erb'
|
$pt_puppetdb_conf_erb = 'puppet_cd/puppetdb/puppetdb.conf.erb'
|
||||||
$pt_puppetdb_repl_ini = "${pt_puppetdb_conf_d}/repl.ini"
|
$pt_puppetdb_repl_ini = "${pt_puppetdb_conf_d}/repl.ini"
|
||||||
$pt_puppetdb_repl_erb = 'puppet_cd/puppetdb/repl.ini.erb'
|
$pt_puppetdb_repl_erb = 'puppet_cd/puppetdb/repl.ini.erb'
|
||||||
|
$pt_puppetdb_service_file = '/usr/lib/systemd/system/puppetdb.service'
|
||||||
|
$pt_puppetdb_service_erb = 'puppet_cd/puppetdb/puppetdb_service.erb'
|
||||||
## r10k
|
## r10k
|
||||||
$pt_r10k_file = "${pt_r10k_dir}/r10k.yaml"
|
$pt_r10k_file = "${pt_r10k_dir}/r10k.yaml"
|
||||||
$pt_r10k_erb = 'puppet_cd/r10k/r10k.yaml.erb'
|
$pt_r10k_erb = 'puppet_cd/r10k/r10k.yaml.erb'
|
||||||
|
|||||||
Reference in New Issue
Block a user