summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Saulnier <fantom@fedoraproject.org>2018-06-18 21:17:29 +0200
committerMatthieu Saulnier <fantom@fedoraproject.org>2018-06-18 21:17:29 +0200
commitfeffc0e8ce805c5fdd3d5c476aa1dadceaa3a57b (patch)
treef4d2f460b595152af8b7a5bf8fdf817d79e6d649
parent6fa8aadc20802e50c35fa6f5feda3b099b0cf32e (diff)
downloadplaybooks-ansible-feffc0e8ce805c5fdd3d5c476aa1dadceaa3a57b.zip
playbooks-ansible-feffc0e8ce805c5fdd3d5c476aa1dadceaa3a57b.tar.gz
playbooks-ansible-feffc0e8ce805c5fdd3d5c476aa1dadceaa3a57b.tar.xz
Revert "Add local mirror available on fallback network"
This reverts commit bff9d64507b2e4e7c43bae4f591bcbf95da4925e.
-rw-r--r--roles/common/files/fedora-fantom-fallback.repo9
-rw-r--r--roles/common/files/updates-fantom-fallback.repo29
-rw-r--r--roles/common/files/updates-testing-fantom-fallback.repo29
-rw-r--r--roles/common/tasks/repos.yml13
4 files changed, 1 insertions, 79 deletions
diff --git a/roles/common/files/fedora-fantom-fallback.repo b/roles/common/files/fedora-fantom-fallback.repo
deleted file mode 100644
index ee9371e..0000000
--- a/roles/common/files/fedora-fantom-fallback.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[fedora-fantom-fallback]
-name=Fedora $releasever - $basearch on Casper's fallback server
-failovermethod=priority
-baseurl=https://10.42.0.52:4433/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
-enabled=0
-metadata_expire=7d
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/roles/common/files/updates-fantom-fallback.repo b/roles/common/files/updates-fantom-fallback.repo
deleted file mode 100644
index 99ac083..0000000
--- a/roles/common/files/updates-fantom-fallback.repo
+++ /dev/null
@@ -1,29 +0,0 @@
-[updates-fantom-fallback]
-name=Fedora $releasever - $basearch - Updates on Casper's fallback server
-failovermethod=priority
-baseurl=https://10.42.0.52:4433/pub/fedora/linux/updates/$releasever/$basearch/
-enabled=0
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-debuginfo-fantom-fallback]
-name=Fedora $releasever - $basearch - Updates - Debug on Casper's fallback server
-failovermethod=priority
-baseurl=https://10.42.0.52:4433/pub/fedora/linux/updates/$releasever/$basearch/debug/
-enabled=0
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-source-fantom-fallback]
-name=Fedora $releasever - Updates Source on Casper's fallback server
-failovermethod=priority
-baseurl=https://10.42.0.52:4433/pub/fedora/linux/updates/$releasever/SRPMS/
-enabled=0
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/roles/common/files/updates-testing-fantom-fallback.repo b/roles/common/files/updates-testing-fantom-fallback.repo
deleted file mode 100644
index 49dd9f3..0000000
--- a/roles/common/files/updates-testing-fantom-fallback.repo
+++ /dev/null
@@ -1,29 +0,0 @@
-[updates-testing-fantom-fallback]
-name=Fedora $releasever - $basearch - Test Updates on Casper's fallback server
-failovermethod=priority
-baseurl=https://10.42.0.52:4433/pub/fedora/linux/updates/testing/$releasever/$basearch/
-enabled=0
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-testing-debuginfo-fantom-fallback]
-name=Fedora $releasever - $basearch - Test Updates Debug on Casper's fallback server
-failovermethod=priority
-baseurl=https://10.42.0.52:4433/pub/fedora/linux/updates/testing/$releasever/$basearch/debug/
-enabled=0
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-testing-source-fantom-fallback]
-name=Fedora $releasever - Test Updates Source on Casper's fallback server
-failovermethod=priority
-baseurl=https://10.42.0.52:4433/pub/fedora/linux/updates/testing/$releasever/SRPMS/
-enabled=0
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/roles/common/tasks/repos.yml b/roles/common/tasks/repos.yml
index 2d1cece..acbae9b 100644
--- a/roles/common/tasks/repos.yml
+++ b/roles/common/tasks/repos.yml
@@ -41,11 +41,6 @@
when: ansible_distribution_version|int >= 20 and ansible_architecture == "x86_64"
and ansible_distribution_release != "Rawhide"
-- name: Installation du dépôt updates Fallback
- copy: src=updates-fantom-fallback.repo dest=/etc/yum.repos.d/updates-fantom-fallback.repo
- when: ansible_distribution_version|int >= 20 and ansible_architecture == "x86_64"
- and ansible_distribution_release != "Rawhide"
-
- name: Installation du dépôt Fedora Fantom
copy: src=fedora-fantom.repo dest=/etc/yum.repos.d/fedora-fantom.repo
@@ -85,17 +80,11 @@
and ansible_distribution_release != "Rawhide" and outdoor is not defined
-- name: Installation du dépôt Fedora fantom Hidden
+- name: Installation du dépôt Fedora Hidden fantom
copy: src=fedora-fantom-hidden.repo dest=/etc/yum.repos.d/fedora-fantom-hidden.repo
when: ansible_distribution_version|int >= 24 and ansible_architecture == "x86_64"
and ansible_distribution_release != "Rawhide"
-- name: Installation du dépôt Fedora fantom Fallback
- copy: src=fedora-fantom-fallback.repo dest=/etc/yum.repos.d/fedora-fantom-fallback.repo
- when: ansible_distribution_version|int >= 24 and ansible_architecture == "x86_64"
- and ansible_distribution_release != "Rawhide"
-
-
- name: Installation du dépôt EPEL pour Centos
yum: name=epel-release state=present
when: ansible_distribution == "CentOS" and ansible_pkg_mgr == "yum"