From d56672208713a536eafebe2734954a9d5559b6d7 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 20 Nov 2018 20:13:37 +0000
Subject: [PATCH] Install modular repos on Fedora 29+ systems

---
 files/common/fedora-modular.repo              | 29 +++++++++++++++++++
 files/common/fedora-modular.repo-secondary    | 29 +++++++++++++++++++
 files/common/fedora-updates-modular.repo      | 26 +++++++++++++++++
 .../fedora-updates-modular.repo-secondary     | 26 +++++++++++++++++
 .../fedora-updates-testing-modular.repo       | 26 +++++++++++++++++
 ...ora-updates-testing-modular.repo-secondary | 26 +++++++++++++++++
 tasks/yumrepos.yml                            | 24 +++++++++++++++
 7 files changed, 186 insertions(+)
 create mode 100644 files/common/fedora-modular.repo
 create mode 100644 files/common/fedora-modular.repo-secondary
 create mode 100644 files/common/fedora-updates-modular.repo
 create mode 100644 files/common/fedora-updates-modular.repo-secondary
 create mode 100644 files/common/fedora-updates-testing-modular.repo
 create mode 100644 files/common/fedora-updates-testing-modular.repo-secondary

diff --git a/files/common/fedora-modular.repo b/files/common/fedora-modular.repo
new file mode 100644
index 0000000000..4ad17c95ab
--- /dev/null
+++ b/files/common/fedora-modular.repo
@@ -0,0 +1,29 @@
+[fedora-modular]
+name=Fedora Modular $releasever - $basearch
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[fedora-modular-debuginfo]
+name=Fedora Modular $releasever - $basearch - Debug
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[fedora-modular-source]
+name=Fedora Modular $releasever - Source
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/files/common/fedora-modular.repo-secondary b/files/common/fedora-modular.repo-secondary
new file mode 100644
index 0000000000..1e0ee865e4
--- /dev/null
+++ b/files/common/fedora-modular.repo-secondary
@@ -0,0 +1,29 @@
+[fedora-modular]
+name=Fedora Modular $releasever - $basearch
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Modular/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[fedora-modular-debuginfo]
+name=Fedora Modular $releasever - $basearch - Debug
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Modular/$basearch/debug/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[fedora-modular-source]
+name=Fedora Modular $releasever - Source
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Modular/source/tree/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/files/common/fedora-updates-modular.repo b/files/common/fedora-updates-modular.repo
new file mode 100644
index 0000000000..6209b45c6e
--- /dev/null
+++ b/files/common/fedora-updates-modular.repo
@@ -0,0 +1,26 @@
+[updates-modular]
+name=Fedora Modular $releasever - $basearch - Updates
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-modular-debuginfo]
+name=Fedora Modular $releasever - $basearch - Updates - Debug
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-modular-source]
+name=Fedora Modular $releasever - Updates Source
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/files/common/fedora-updates-modular.repo-secondary b/files/common/fedora-updates-modular.repo-secondary
new file mode 100644
index 0000000000..2c7f326248
--- /dev/null
+++ b/files/common/fedora-updates-modular.repo-secondary
@@ -0,0 +1,26 @@
+[updates-modular]
+name=Fedora Modular $releasever - $basearch - Updates
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/$basearch/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-modular-debuginfo]
+name=Fedora Modular $releasever - $basearch - Updates - Debug
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/$basearch/debug/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-modular-source]
+name=Fedora Modular $releasever - Updates Source
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/SRPMS/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/files/common/fedora-updates-testing-modular.repo b/files/common/fedora-updates-testing-modular.repo
new file mode 100644
index 0000000000..f5568e1dde
--- /dev/null
+++ b/files/common/fedora-updates-testing-modular.repo
@@ -0,0 +1,26 @@
+[updates-testing-modular]
+name=Fedora Modular $releasever - $basearch - Test Updates
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-testing-modular-debuginfo]
+name=Fedora Modular $releasever - $basearch - Test Updates Debug
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-testing-modular-source]
+name=Fedora Modular $releasever - Test Updates Source
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/files/common/fedora-updates-testing-modular.repo-secondary b/files/common/fedora-updates-testing-modular.repo-secondary
new file mode 100644
index 0000000000..aabf4b721a
--- /dev/null
+++ b/files/common/fedora-updates-testing-modular.repo-secondary
@@ -0,0 +1,26 @@
+[updates-testing-modular]
+name=Fedora Modular $releasever - $basearch - Test Updates
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/Modular/$basearch/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-testing-modular-debuginfo]
+name=Fedora Modular $releasever - $basearch - Test Updates Debug
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/$basearch/debug/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-testing-modular-source]
+name=Fedora Modular $releasever - Test Updates Source
+failovermethod=priority
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/SRPMS/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml
index e9e554e986..0528f5f5ac 100644
--- a/tasks/yumrepos.yml
+++ b/tasks/yumrepos.yml
@@ -43,6 +43,18 @@
   - packages
   - yumrepos
 
+- name: put fedora modular repos on primary architecture systems
+  template: src="{{ files }}/common/{{ item }}" dest="/etc/yum.repos.d/{{ item }}"
+  with_items:
+  - fedora-modular.repo
+  - fedora-updates-modular.repo
+  - fedora-updates-testing-modular.repo
+  when: ansible_distribution == 'Fedora' and ansible_distribution_major_version >= 29 and (ansible_architecture == 'aarch64' or ansible_architecture == 'x86_64' or ansible_architecture == 'i386' or ansible_architecture == 'armv7l') and not inventory_hostname.startswith('arm03') and not inventory_hostname.startswith('wiki01.stg')
+  tags:
+  - config
+  - packages
+  - yumrepos
+
 - name: put fedora repos on secondary architecture systems
   template: src="{{ files }}/common/{{ item }}-secondary" dest="/etc/yum.repos.d/{{ item }}"
   with_items:
@@ -55,6 +67,18 @@
   - packages
   - yumrepos
 
+- name: put fedora repos on secondary architecture systems
+  template: src="{{ files }}/common/{{ item }}-secondary" dest="/etc/yum.repos.d/{{ item }}"
+  with_items:
+  - fedora-modular.repo
+  - fedora-updates-modular.repo
+  - fedora-updates-testing-modular.repo
+  when: ansible_distribution == 'Fedora' and ansible_distribution_major_version >= 29 and (ansible_architecture == 'ppc64le' or ansible_architecture == 's390x')
+  tags:
+  - config
+  - packages
+  - yumrepos
+
 - name: add aarch64 server rpms repo
   copy: src="{{ files }}/common/rhel-7-aarch64-server-rpms.repo" dest="/etc/yum.repos.d/rhel-7-aarch64-server-rpms.repo"
   when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and inventory_hostname.startswith('aarch64-c')