From ec69c4706d872791db7ebb61217c7338a261d314 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 16 Aug 2018 11:06:36 -0700 Subject: [PATCH] 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 --- modules/openstack_project/manifests/git.pp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/openstack_project/manifests/git.pp b/modules/openstack_project/manifests/git.pp index 0b9fb1fcd8..cd5ff5e4a4 100644 --- a/modules/openstack_project/manifests/git.pp +++ b/modules/openstack_project/manifests/git.pp @@ -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