From 082c5174b174303a38e9cf0b5d33eeb8f5ef89dc Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 24 Jan 2018 09:33:57 -0600 Subject: [PATCH] Turn off puppet reports We have puppet configured to write reports when it runs. We used to collect these and inject them into puppetdb. Since we don't do this anymore, they're just a giant pile of files we never see. Enable managing the puppet.conf file from ansible and then also turn off the reports. Change-Id: I55bef052bddc9b9ff5de76a4f0b2ec07f93f158c --- playbooks/remote_puppet_adhoc.yaml | 3 ++- playbooks/remote_puppet_afs.yaml | 2 ++ playbooks/remote_puppet_else.yaml | 2 ++ playbooks/remote_puppet_git.yaml | 14 ++++++++++---- playbooks/remote_puppet_infracloud.yaml | 6 ++++-- playbooks/remote_puppet_infracloud_baremetal.yaml | 2 ++ 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/playbooks/remote_puppet_adhoc.yaml b/playbooks/remote_puppet_adhoc.yaml index 036fa91295..fc11debf07 100644 --- a/playbooks/remote_puppet_adhoc.yaml +++ b/playbooks/remote_puppet_adhoc.yaml @@ -3,4 +3,5 @@ gather_facts: true roles: - role: puppet - manage_config: true + manage_config: True + puppet_reports: none diff --git a/playbooks/remote_puppet_afs.yaml b/playbooks/remote_puppet_afs.yaml index 21abd1214b..5657271e0c 100644 --- a/playbooks/remote_puppet_afs.yaml +++ b/playbooks/remote_puppet_afs.yaml @@ -4,3 +4,5 @@ gather_facts: true roles: - role: puppet + manage_config: True + puppet_reports: none diff --git a/playbooks/remote_puppet_else.yaml b/playbooks/remote_puppet_else.yaml index 4d2b49b893..e4afd0a5fe 100644 --- a/playbooks/remote_puppet_else.yaml +++ b/playbooks/remote_puppet_else.yaml @@ -3,3 +3,5 @@ gather_facts: true roles: - role: puppet + manage_config: True + puppet_reports: none diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml index fb25743e65..a36f948af8 100644 --- a/playbooks/remote_puppet_git.yaml +++ b/playbooks/remote_puppet_git.yaml @@ -12,6 +12,8 @@ - role: puppet copy_hieradata: False copy_puppet: False + manage_config: True + puppet_reports: none - hosts: "git0*:!disabled" strategy: free gather_facts: true @@ -20,6 +22,8 @@ - role: puppet facts: project_config_ref: "{{ hostvars.localhost.gitinfo.after }}" + manage_config: True + puppet_reports: none - hosts: "review.openstack.org:!disabled" strategy: free gather_facts: true @@ -27,8 +31,9 @@ - role: puppet facts: project_config_ref: "{{ hostvars.localhost.gitinfo.after }}" - vars: - puppet_timeout: 60m + puppet_timeout: 60m + manage_config: True + puppet_reports: none - hosts: "zuul-scheduler:!disabled" strategy: free gather_facts: true @@ -36,5 +41,6 @@ - role: puppet facts: project_config_ref: "{{ hostvars.localhost.gitinfo.after }}" - vars: - puppet_timeout: 60m + puppet_timeout: 60m + manage_config: True + puppet_reports: none diff --git a/playbooks/remote_puppet_infracloud.yaml b/playbooks/remote_puppet_infracloud.yaml index 8912c3b8c7..ac3a0c794a 100644 --- a/playbooks/remote_puppet_infracloud.yaml +++ b/playbooks/remote_puppet_infracloud.yaml @@ -4,11 +4,13 @@ serial: 1 roles: - role: puppet - manage_config: true + manage_config: True + puppet_reports: none - hosts: "compute*.ic.openstack.org:!disabled" gather_facts: true max_fail_percentage: 100 serial: "10%" roles: - role: puppet - manage_config: true + manage_config: True + puppet_reports: none diff --git a/playbooks/remote_puppet_infracloud_baremetal.yaml b/playbooks/remote_puppet_infracloud_baremetal.yaml index ac025e577e..a162af165b 100644 --- a/playbooks/remote_puppet_infracloud_baremetal.yaml +++ b/playbooks/remote_puppet_infracloud_baremetal.yaml @@ -3,3 +3,5 @@ gather_facts: true roles: - role: puppet + manage_config: True + puppet_reports: none