Merge branch 'jenkins-build-18' into 'master'
Auto-merge for build 18 See merge request puppet/prometheus_cd!17
This commit is contained in:
@@ -134,7 +134,7 @@ class prometheus_cd::main::files (
|
|||||||
seltype => etc_t,
|
seltype => etc_t,
|
||||||
seluser => system_u,
|
seluser => system_u,
|
||||||
content => template('prometheus_cd/prometheus.yml.erb'),
|
content => template('prometheus_cd/prometheus.yml.erb'),
|
||||||
notify => Service[ps_prom_service],
|
notify => Service[$ps_prom_service],
|
||||||
}
|
}
|
||||||
}</pre>
|
}</pre>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -16,6 +16,6 @@ class prometheus_cd::main::files (
|
|||||||
seltype => etc_t,
|
seltype => etc_t,
|
||||||
seluser => system_u,
|
seluser => system_u,
|
||||||
content => template('prometheus_cd/prometheus.yml.erb'),
|
content => template('prometheus_cd/prometheus.yml.erb'),
|
||||||
notify => Service[ps_prom_service],
|
notify => Service[$ps_prom_service],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user