opendev/system-config
Code Issues Proposed changes

Stop logging puppet to syslog

Browse Source 
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
This commit is contained in:
Monty Taylor 2020-04-21 13:45:32 -05:00
parent 9fd2135a46
commit 99aa528c83
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.zuul.yaml
View File

@ -1031,6 +1031,7 @@
- playbooks/service-eavesdrop.yaml - playbooks/service-eavesdrop.yaml
- playbooks/run-accessbot.yaml - playbooks/run-accessbot.yaml
- playbooks/group_vars/eavesdrop.yaml - playbooks/group_vars/eavesdrop.yaml
- playbooks/group_vars/puppet.yaml
- playbooks/roles/zuul-user - playbooks/roles/zuul-user
- playbooks/roles/install-docker - playbooks/roles/install-docker
- playbooks/roles/puppet-install/ - playbooks/roles/puppet-install/
@ -1059,6 +1060,7 @@
files: files:
- playbooks/install-ansible.yaml - playbooks/install-ansible.yaml
- playbooks/service-codesearch.yaml - playbooks/service-codesearch.yaml
- playbooks/group_vars/puppet.yaml
- playbooks/roles/sync-project-config - playbooks/roles/sync-project-config
- playbooks/roles/puppet-install/ - playbooks/roles/puppet-install/
- playbooks/roles/disable-puppet-agent/ - playbooks/roles/disable-puppet-agent/
@ -2322,6 +2324,7 @@
- inventory/ - inventory/
- playbooks/install-ansible.yaml - playbooks/install-ansible.yaml
- playbooks/service-codesearch.yaml - playbooks/service-codesearch.yaml
- playbooks/group_vars/puppet.yaml
- playbooks/roles/sync-project-config - playbooks/roles/sync-project-config
- playbooks/roles/puppet-install/ - playbooks/roles/puppet-install/
- playbooks/roles/disable-puppet-agent/ - playbooks/roles/disable-puppet-agent/
@ -2352,6 +2355,7 @@
- playbooks/service-eavesdrop.yaml - playbooks/service-eavesdrop.yaml
- playbooks/run-accessbot.yaml - playbooks/run-accessbot.yaml
- playbooks/group_vars/eavesdrop.yaml - playbooks/group_vars/eavesdrop.yaml
- playbooks/group_vars/puppet.yaml
- playbooks/roles/zuul-user - playbooks/roles/zuul-user
- playbooks/roles/install-docker - playbooks/roles/install-docker
- playbooks/roles/puppet-install/ - playbooks/roles/puppet-install/

2
playbooks/group_vars/puppet.yaml
View File

@ -6,7 +6,7 @@ manage_config: true
manifest: /opt/system-config/production/manifests/site.pp manifest: /opt/system-config/production/manifests/site.pp
manifest_base: /opt/system-config/production manifest_base: /opt/system-config/production
mgmt_manifestpath: /home/zuul/src/opendev.org/opendev/system-config/ mgmt_manifestpath: /home/zuul/src/opendev.org/opendev/system-config/
puppet_logdest: syslog puppet_color: 'false'
mgmt_hieradata: /etc/ansible/hosts mgmt_hieradata: /etc/ansible/hosts
mgmt_puppet_module_dir: /etc/puppet/modules mgmt_puppet_module_dir: /etc/puppet/modules
puppet_hieradata_link_dest: /opt/system-config/hieradata puppet_hieradata_link_dest: /opt/system-config/hieradata