opendev/system-config
Code Issues Proposed changes

Merge "haproxy: don't manage rsyslog service"

Browse Source
This commit is contained in:
Zuul 2018-08-20 16:57:10 +00:00 committed by Gerrit Code Review
commit d9ee39fa47
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/openstack_project/manifests/git.pp
View File

@ -137,21 +137,14 @@ class openstack_project::git (
before => Service['haproxy'], before => Service['haproxy'],
} }
# TODO(mordred) We should get this haproxy stuff ported to ansible ASAP.
# Ansible is the one installing rsyslog.
file { '/etc/rsyslog.d/haproxy.conf': file { '/etc/rsyslog.d/haproxy.conf':
ensure => present, ensure => present,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
source => 'puppet:///modules/openstack_project/git/rsyslog.haproxy.conf', source => 'puppet:///modules/openstack_project/git/rsyslog.haproxy.conf',
notify => Service['rsyslog'],
}
# TODO(mordred) We should get this haproxy stuff ported to ansible ASAP.
# Ansible is the one installing rsyslog.
service { 'rsyslog':
ensure => running,
enable => true,
hasrestart => true,
} }
# haproxy statsd # haproxy statsd