From 99aa528c8302bbaa4683d0bf83cf9c0db853d5d6 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 21 Apr 2020 13:45:32 -0500 Subject: [PATCH] Stop logging puppet to syslog We run puppet with ansible now pretty much all the time. It's not helpful for the puppet output to go to syslog on the remote host. What's more helpful is for it to come back to the stdout in the ansible playbook so that we can see it. Also turn off ansi color from the output. Depends-On: https://review.opendev.org/721732 Change-Id: I604081d5400bd53b8dda5a3a7685323c1443991b --- .zuul.yaml | 4 ++++ playbooks/group_vars/puppet.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 76ad5fd309..268576767b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1031,6 +1031,7 @@ - playbooks/service-eavesdrop.yaml - playbooks/run-accessbot.yaml - playbooks/group_vars/eavesdrop.yaml + - playbooks/group_vars/puppet.yaml - playbooks/roles/zuul-user - playbooks/roles/install-docker - playbooks/roles/puppet-install/ @@ -1059,6 +1060,7 @@ files: - playbooks/install-ansible.yaml - playbooks/service-codesearch.yaml + - playbooks/group_vars/puppet.yaml - playbooks/roles/sync-project-config - playbooks/roles/puppet-install/ - playbooks/roles/disable-puppet-agent/ @@ -2322,6 +2324,7 @@ - inventory/ - playbooks/install-ansible.yaml - playbooks/service-codesearch.yaml + - playbooks/group_vars/puppet.yaml - playbooks/roles/sync-project-config - playbooks/roles/puppet-install/ - playbooks/roles/disable-puppet-agent/ @@ -2352,6 +2355,7 @@ - playbooks/service-eavesdrop.yaml - playbooks/run-accessbot.yaml - playbooks/group_vars/eavesdrop.yaml + - playbooks/group_vars/puppet.yaml - playbooks/roles/zuul-user - playbooks/roles/install-docker - playbooks/roles/puppet-install/ diff --git a/playbooks/group_vars/puppet.yaml b/playbooks/group_vars/puppet.yaml index 4bec948005..e6bec333f5 100644 --- a/playbooks/group_vars/puppet.yaml +++ b/playbooks/group_vars/puppet.yaml @@ -6,7 +6,7 @@ manage_config: true manifest: /opt/system-config/production/manifests/site.pp manifest_base: /opt/system-config/production mgmt_manifestpath: /home/zuul/src/opendev.org/opendev/system-config/ -puppet_logdest: syslog +puppet_color: 'false' mgmt_hieradata: /etc/ansible/hosts mgmt_puppet_module_dir: /etc/puppet/modules puppet_hieradata_link_dest: /opt/system-config/hieradata