haproxy: don't manage rsyslog service
Ansible handles rsyslog, so rather than having both systems attempting to manage the service, just let Ansible do it. However, we still install the haproxy rsyslog config file in Puppet for now. The downside of that is that an initial server build, or change to the config file, will not cause rsyslog to reload. That will need to be done manually until the rest of this is ported to Ansible. Change-Id: I19060fddf55e7e9f7030e49592f20a4a7faca429
This commit is contained in:
parent
98ff30b699
commit
ec69c4706d
@ -137,21 +137,14 @@ class openstack_project::git (
|
||||
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':
|
||||
ensure => present,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user