From d5d344e58bc368598dae2b1d456ee45550b71a89 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 1 Aug 2016 15:05:59 +0000 Subject: Make koji_builders site-defaults.cfg into a template. --- roles/koji_builder/files/builders/site-defaults.cfg | 3 --- roles/koji_builder/tasks/main.yml | 2 +- roles/koji_builder/templates/builders/site-defaults.cfg | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 roles/koji_builder/files/builders/site-defaults.cfg create mode 100644 roles/koji_builder/templates/builders/site-defaults.cfg diff --git a/roles/koji_builder/files/builders/site-defaults.cfg b/roles/koji_builder/files/builders/site-defaults.cfg deleted file mode 100644 index 44571db98..000000000 --- a/roles/koji_builder/files/builders/site-defaults.cfg +++ /dev/null @@ -1,3 +0,0 @@ -config_opts['plugin_conf']['package_state_enable'] = False -config_opts['plugin_conf']['ccache_enable'] = False -config_opts['dnf_common_opts'] = ['--setopt=install_weak_deps=0'] diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml index e0bd2106d..eeb4eff68 100644 --- a/roles/koji_builder/tasks/main.yml +++ b/roles/koji_builder/tasks/main.yml @@ -195,7 +195,7 @@ - koji_builder - name: mock site-defaults.cfg - copy: src=builders/site-defaults.cfg dest=/etc/mock/site-defaults.cfg mode=0644 owner=root group=mock + template: src=builders/site-defaults.cfg dest=/etc/mock/site-defaults.cfg mode=0644 owner=root group=mock when: not inventory_hostname.startswith('bkernel') tags: - koji_builder diff --git a/roles/koji_builder/templates/builders/site-defaults.cfg b/roles/koji_builder/templates/builders/site-defaults.cfg new file mode 100644 index 000000000..44571db98 --- /dev/null +++ b/roles/koji_builder/templates/builders/site-defaults.cfg @@ -0,0 +1,3 @@ +config_opts['plugin_conf']['package_state_enable'] = False +config_opts['plugin_conf']['ccache_enable'] = False +config_opts['dnf_common_opts'] = ['--setopt=install_weak_deps=0'] -- cgit