Merge branch 'master' of /git/ansible

roles/distgit/tasks/main.yml

@@ -186,20 +186,20 @@
             owner=root group=root mode=0755
   with_items:
     - genacls.pkgdb
-  when: env != "staging"
+  #when: env != "staging"
   tags:
   - config
   - distgit
 
-- name: install the genacls.pkgdb scripts
+#- name: install the genacls.pkgdb scripts
-  template: src={{item}} dest=/usr/local/bin/genacls.pkgdb
+#  template: src={{item}} dest=/usr/local/bin/genacls.pkgdb
-            owner=root group=root mode=0755
+#            owner=root group=root mode=0755
-  with_items:
+#  with_items:
-    - genacls.pkgdb.stg
+#    - genacls.pkgdb.stg
-  when: env == "staging"
+#  when: env == "staging"
-  tags:
+#  tags:
-  - config
+#  - config
-  - distgit
+#  - distgit
 
 - name: Add the genacl daily cron job
   copy: src=genacls.cron dest=/etc/cron.d/genacls.cron

roles/koji_builder/templates/builders/site-defaults.cfg

@@ -1,12 +1,11 @@
 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']
-
+#{% if env == 'staging' %}
-{% if env == 'staging' %}
+#config_opts['plugin_conf']['tmpfs_enable'] = True
-config_opts['plugin_conf']['tmpfs_enable'] = True
+#config_opts['plugin_conf']['tmpfs_opts'] = {}
-config_opts['plugin_conf']['tmpfs_opts'] = {}
+#config_opts['plugin_conf']['tmpfs_opts']['required_ram_mb'] = 1024
-config_opts['plugin_conf']['tmpfs_opts']['required_ram_mb'] = 1024
+#config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '6g'
-config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '6g'
+#config_opts['plugin_conf']['tmpfs_opts']['mode'] = '0755'
-config_opts['plugin_conf']['tmpfs_opts']['mode'] = '0755'
+#config_opts['plugin_conf']['tmpfs_opts']['keep_mounted'] = False
-config_opts['plugin_conf']['tmpfs_opts']['keep_mounted'] = False
+#{% endif %}
-{% endif %}