On Fri, 12 Aug 2016 12:43:46 -0600
Kevin Fenzi <kevin@xxxxxxxxx> wrote:
> Greetings.
>
> Fedora 24 alpha is running into some bugs because the updates-testing
> repo does not have any weak deps in it's repodata. This is because
> bodhi-backend01 is a rhel7 instance and it's rpm is too old to have
> them.
>
> So, I have created a bodhi-backend03 instance thats Fedora 24 and
> would like to try pushing the fedora-24-updates-testing updates (to
> start with) from there to see if it fixes the issue.
>
> The attached patch should fix the bodhi roles to call 'package'
> instead of yum module (so they work on either rhel7 or fedora24) and
> add in a bodhi2 f24 repo to install from.
>
> +1s?
>
> kevin
And with the actual patch...
kevin
--
From 127acb80a781781f443a78736f247ba9a6914739 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@xxxxxxxxx>
Date: Fri, 12 Aug 2016 18:37:26 +0000
Subject: [PATCH] Fix bodhi-backend role and base role to use package instead
of yum and install from bowlofeggs copr for fedora
---
roles/bodhi2/backend/tasks/main.yml | 4 ++--
roles/bodhi2/base/files/bowlofeggs-bodhi-fedora-24.repo | 8 ++++++++
roles/bodhi2/base/tasks/main.yml | 14 +++++++++++++-
3 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 roles/bodhi2/base/files/bowlofeggs-bodhi-fedora-24.repo
diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index 0b8cfde..c72bd3a 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -13,7 +13,7 @@
- bodhi
- name: install needed packages
- yum: pkg={{ item }} state=present
+ package: pkg={{ item }} state=present
with_items:
- mock
- mash
@@ -112,7 +112,7 @@
# tasks for setting up epelmasher
- name: install needed packages
- yum: pkg={{ item }} state=present
+ package: pkg={{ item }} state=present
with_items:
- repoview
tags:
diff --git a/roles/bodhi2/base/files/bowlofeggs-bodhi-fedora-24.repo b/roles/bodhi2/base/files/bowlofeggs-bodhi-fedora-24.repo
new file mode 100644
index 0000000..fdc5f32
--- /dev/null
+++ b/roles/bodhi2/base/files/bowlofeggs-bodhi-fedora-24.repo
@@ -0,0 +1,8 @@
+[bowlofeggs-bodhi]
+name=Copr repo for bodhi owned by bowlofeggs
+baseurl=https://copr-be.cloud.fedoraproject.org/results/bowlofeggs/bodhi/fedora-$releasever-$basearch/
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://copr-be.cloud.fedoraproject.org/results/bowlofeggs/bodhi/pubkey.gpg
+enabled=1
+enabled_metadata=1
diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml
index fa2e22c..3d6f613 100644
--- a/roles/bodhi2/base/tasks/main.yml
+++ b/roles/bodhi2/base/tasks/main.yml
@@ -12,10 +12,22 @@
tags:
- config
- bodhi
+ when: ansible_distribution_major_version|int == 7
+- name: setup the bodhi2 copr repo
+ copy: >
+ src="bowlofeggs-bodhi2-fedora-24.repo"
+ dest="/etc/yum.repos.d/bowlofeggs-bodhi2-fedora-24.repo"
+ owner=root
+ group=root
+ mode=0644
+ tags:
+ - config
+ - bodhi
+ when: ansible_distribution_major_version|int == 24
- name: install needed packages
- yum: pkg={{ item }} state=present
+ package: pkg={{ item }} state=present
with_items:
- bodhi-server
- libsemanage-python
--
1.8.3.1
Attachment:
pgplr1j8WciIg.pgp
Description: OpenPGP digital signature
_______________________________________________ infrastructure mailing list infrastructure@xxxxxxxxxxxxxxxxxxxxxxx https://lists.fedoraproject.org/admin/lists/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
