For some reason, Bodhi has two separate config file templates for staging and production. This has caused problems a few times in the past if people update one and forget to update the other. We should combine them into one config file that uses templated if statements where they need to diverge.
Due to people forgetting to update them both over time, it is also likely that there are differences that don't need to be there, so some judgement will be needed on each point of difference.
These are the two files that we have today:
https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/roles/bodhi2/base/templates/staging.ini.j2 https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/roles/bodhi2/base/templates/production.ini.j2
We will also need to adjust the task so that it uses just one template for staging and production:
https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/roles/bodhi2/base/tasks/main.yml
I'm taking a look at this.
Hosted here: https://infrastructure.fedoraproject.org/infra/ansible.git
Yep. It's in that repo.
You might look at the roles/haproxy/templates/ as they do something very similar...
I have a file ready.. what git should I clone to PR to?
I don't think it's possible to send pull requests for Ansible. I recommend using git format-patch HEAD^ to generate a patch file for your change, and then you can e-mail that patch to the infra list.
git format-patch HEAD^
Done and done.
Anyone get a chance to look at that patch?
@skeer I haven't been able to yet, because bodhi has been "on fire" all week. I also will be very busy next week, so it may be a while before I get a chance. It is on my todo list though!
Whats the status here? Did that patch ever get applied?
@kevin IIRC, we never arrived at a working patch that could be applied.
Commited in https://infrastructure.fedoraproject.org/cgit/ansible.git/commit/?id=f75c4df
I merged the stg and prod ones with the one shipped by upstream, allowing us to drop a bunch of old stuff.
:outbox_tray:
Metadata Update from @kevin: - Issue close_status updated to: Fixed - Issue status updated to: Closed (was: Open)
Login to comment on this ticket.