Hi all,
So, let's do this.
Can I get +1s for the first steps to switch to Bodhi 3.0?
1. The underneath patch and deploy with Ansible
2. Updating bodhi*.phx2 to bodhi 3.0
I will need to do more changes, like updating the sync script.
Would people be fine if I just make further changes and send a summary
at the end?
None of them should be hard to revert.
Regards,
Patrick
commit e64d275f6ad1e830f2374b0309f85d5dda697944 (HEAD -> master)
Author: Patrick Uiterwijk <patrick@xxxxxxxxxxxxxx>
Date: Tue Oct 24 16:16:50 2017 +0200
Deploy Bodhi3 config to production
Signed-off-by: Patrick Uiterwijk <patrick@xxxxxxxxxxxxxx>
diff --git a/roles/bodhi2/backend/tasks/main.yml
b/roles/bodhi2/backend/tasks/main.yml
index a8acf50ee..bc5a6b239 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -20,23 +20,14 @@
- fedmsg-hub
- fedmsg-relay
- python-mock
- - python2-fedmsg-atomic-composer
- sigul
- python-alembic
- python-scandir
- python2-productmd
- compose-utils
- python-fedmsg-meta-fedora-infrastructure
- tags:
- - packages
- - bodhi
-
-- name: Install pungi (staging)
- package: name={{item}} state=present
- with_items:
- pungi
- pungi-utils
- when: env == "staging"
tags:
- packages
- bodhi
diff --git a/roles/bodhi2/base/templates/production.ini.j2
b/roles/bodhi2/base/templates/production.ini.j2
index 74c0b6e0c..31ced4b88 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -113,25 +113,13 @@ releng_fedmsg_certname =
shell-bodhi-backend03.phx2.fedoraproject.org
# will act as a masher as well.
#masher = None
-# Where to initially mash repositories
-#mash_dir = /var/cache/bodhi/mashing
-{% if ansible_hostname == 'bodhi-backend01' %}
-mash_dir = /mnt/koji/mash/updates
-{% else %}
-# mash_dir =
-{% endif %}
-
-# Where to symlink the latest repos by their tag name
-#mash_stage_dir = /var/cache/bodhi/mashed
-{% if ansible_hostname == 'bodhi-backend01' %}
-mash_stage_dir = /mnt/koji/mash/updates
-{% else %}
-# mash_stage_dir =
-{% endif %}
-
-mash_conf = /etc/bodhi/mash.conf
-
-createrepo_cache_dir = /var/cache/createrepo
+mash_dir = /mnt/koji/compose/updates/
+mash_stage_dir = /mnt/koji/compose/updates/
+pungi.basepath = /etc/bodhi
+pungi.conf.rpm = pungi.rpm.conf.j2
+pungi.conf.module = pungi.module.conf.j2
+pungi.labeltype = Update
+pungi.extracmdline = --notification-script=/usr/bin/pungi-fedmsg-notification
## Our periodic jobs
#jobs = clean_repo nagmail fix_bug_titles cache_release_data
approve_testing_updates
_______________________________________________
infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
