9:25 a.m.
From: Michael Scherer <misc(a)zarb.org>
Since the role is added a dependencie of base, I also removed
it from all playbooks, since all of them will pull yumrepos.
Bonus point, it will be pulled first, avoiding ordering issues
(since tasks are run after roles, and several roles likely
need to have yumrepos setup to work fine)
---
files/common/epel6.repo | 13 ------
files/common/epel7.repo | 20 ---------
files/common/fedora-updates-testing.repo | 26 -----------
files/common/fedora-updates-testing.repo-secondary | 26 -----------
files/common/fedora-updates.repo | 26 -----------
files/common/fedora-updates.repo-secondary | 26 -----------
files/common/fedora.repo | 29 -------------
files/common/fedora.repo-secondary | 29 -------------
files/common/infrastructure-testing.repo | 7 ---
files/common/infrastructure.repo | 6 ---
files/common/rhel6.repo | 14 ------
files/common/rhel7.repo | 24 -----------
playbooks/groups/anitya.yml | 1 -
playbooks/groups/arm-packager.yml | 3 --
playbooks/groups/arm-qa.yml | 3 --
playbooks/groups/ask.yml | 1 -
playbooks/groups/atomic.yml | 1 -
playbooks/groups/autocloud-backend.yml | 3 --
playbooks/groups/autocloud-web.yml | 3 --
playbooks/groups/autosign.yml | 1 -
playbooks/groups/backup-server.yml | 1 -
playbooks/groups/badges-backend.yml | 1 -
playbooks/groups/badges-web.yml | 1 -
playbooks/groups/basset.yml | 1 -
playbooks/groups/bastion.yml | 1 -
playbooks/groups/batcave.yml | 1 -
playbooks/groups/beaker-stg.yml | 1 -
playbooks/groups/beaker-virthosts.yml | 1 -
playbooks/groups/beaker.yml | 1 -
playbooks/groups/blockerbugs.yml | 1 -
playbooks/groups/bodhi-backend.yml | 1 -
playbooks/groups/bodhi2.yml | 1 -
playbooks/groups/bugyou.yml | 1 -
playbooks/groups/bugzilla2fedmsg.yml | 1 -
playbooks/groups/buildhw.yml | 1 -
playbooks/groups/buildvm.yml | 1 -
playbooks/groups/busgateway.yml | 1 -
playbooks/groups/darkserver-backend.yml | 1 -
playbooks/groups/darkserver-web.yml | 1 -
playbooks/groups/darkserver.yml | 1 -
playbooks/groups/datagrepper.yml | 1 -
playbooks/groups/dhcp.yml | 1 -
playbooks/groups/dns.yml | 1 -
playbooks/groups/docker-registry.yml | 1 -
playbooks/groups/docs-backend.yml | 1 -
playbooks/groups/download.yml | 1 -
playbooks/groups/elections.yml | 1 -
playbooks/groups/fas.yml | 1 -
playbooks/groups/fedimg.yml | 1 -
playbooks/groups/fedocal.yml | 1 -
playbooks/groups/gallery.yml | 1 -
playbooks/groups/github2fedmsg.yml | 1 -
playbooks/groups/gnome-backups.yml | 1 -
playbooks/groups/hosted.yml | 1 -
playbooks/groups/hotness.yml | 1 -
playbooks/groups/infinote.yml | 1 -
playbooks/groups/ipsilon.yml | 1 -
playbooks/groups/jenkins-master.yml | 2 -
playbooks/groups/jenkins-slave.yml | 2 -
playbooks/groups/kerneltest.yml | 1 -
playbooks/groups/keyserver.yml | 1 -
playbooks/groups/koji-hub.yml | 1 -
playbooks/groups/kojipkgs.yml | 1 -
playbooks/groups/koschei.yml | 1 -
playbooks/groups/logserver.yml | 1 -
playbooks/groups/mailman.yml | 1 -
playbooks/groups/mariadb-server.yml | 1 -
playbooks/groups/mdapi.yml | 1 -
playbooks/groups/memcached.yml | 1 -
playbooks/groups/mirrorlist2.yml | 1 -
playbooks/groups/mirrormanager.yml | 1 -
playbooks/groups/noc.yml | 1 -
playbooks/groups/notifs-backend.yml | 1 -
playbooks/groups/notifs-web.yml | 1 -
playbooks/groups/nuancier.yml | 1 -
playbooks/groups/openqa-workers.yml | 1 -
playbooks/groups/openqa.yml | 1 -
playbooks/groups/openstack-compute-nodes.yml | 1 -
playbooks/groups/osbs-master.yml | 1 -
playbooks/groups/packages.yml | 1 -
playbooks/groups/pagure.yml | 1 -
playbooks/groups/paste.yml | 1 -
playbooks/groups/pdc.yml | 1 -
playbooks/groups/people.yml | 1 -
playbooks/groups/pkgdb.yml | 1 -
playbooks/groups/pkgs.yml | 1 -
playbooks/groups/postgresql-server.yml | 1 -
playbooks/groups/proxies.yml | 1 -
playbooks/groups/qa-stg.yml | 1 -
playbooks/groups/qadevel.yml | 1 -
playbooks/groups/releng-compose.yml | 1 -
playbooks/groups/resultsdb-dev.yml | 1 -
playbooks/groups/resultsdb-prod.yml | 1 -
playbooks/groups/resultsdb-stg.yml | 1 -
playbooks/groups/retrace.yml | 1 -
playbooks/groups/secondary.yml | 1 -
playbooks/groups/sign-bridge.yml | 1 -
playbooks/groups/smtp-mm.yml | 1 -
playbooks/groups/statscache.yml | 1 -
playbooks/groups/summershum.yml | 1 -
playbooks/groups/sundries.yml | 1 -
playbooks/groups/tagger.yml | 1 -
playbooks/groups/taskotron-client-hosts.yml | 1 -
playbooks/groups/taskotron-dev.yml | 1 -
playbooks/groups/taskotron-prod.yml | 1 -
playbooks/groups/taskotron-stg.yml | 1 -
playbooks/groups/taskotron.yml | 1 -
playbooks/groups/torrent.yml | 1 -
playbooks/groups/unbound.yml | 1 -
playbooks/groups/value.yml | 1 -
playbooks/groups/virthost.yml | 1 -
playbooks/groups/wiki.yml | 1 -
playbooks/groups/zanata2fedmsg.yml | 1 -
.../hosts/cloud-noc01.cloud.fedoraproject.org.yml | 1 -
.../data-analysis01.phx2.fedoraproject.org.yml | 3 --
.../hosts/fedimg-dev.fedorainfracloud.org.yml | 3 +-
playbooks/hosts/fedora-hubs-dev.yml | 3 +-
.../hosts/grafana.cloud.fedoraproject.org.yml | 1 -
playbooks/hosts/lists-dev.fedorainfracloud.org.yml | 1 -
playbooks/hosts/piwik.fedorainfracloud.org.yml | 5 +--
playbooks/manual/qadevel.yml | 1 -
roles/base/meta/main.yml | 1 +
roles/yumrepos/files/epel6.repo | 13 ++++++
roles/yumrepos/files/epel7.repo | 20 +++++++++
roles/yumrepos/files/fedora-updates-testing.repo | 26 +++++++++++
.../files/fedora-updates-testing.repo-secondary | 26 +++++++++++
roles/yumrepos/files/fedora-updates.repo | 26 +++++++++++
roles/yumrepos/files/fedora-updates.repo-secondary | 26 +++++++++++
roles/yumrepos/files/fedora.repo | 29 +++++++++++++
roles/yumrepos/files/fedora.repo-secondary | 29 +++++++++++++
roles/yumrepos/files/infrastructure-testing.repo | 7 +++
roles/yumrepos/files/infrastructure.repo | 6 +++
roles/yumrepos/files/rhel6.repo | 14 ++++++
roles/yumrepos/files/rhel7.repo | 24 +++++++++++
roles/yumrepos/tasks/yumrepos.yml | 50 ++++++++++++++++++++++
tasks/yumrepos.yml | 50 ----------------------
136 files changed, 302 insertions(+), 420 deletions(-)
delete mode 100644 files/common/epel6.repo
delete mode 100644 files/common/epel7.repo
delete mode 100644 files/common/fedora-updates-testing.repo
delete mode 100644 files/common/fedora-updates-testing.repo-secondary
delete mode 100644 files/common/fedora-updates.repo
delete mode 100644 files/common/fedora-updates.repo-secondary
delete mode 100644 files/common/fedora.repo
delete mode 100644 files/common/fedora.repo-secondary
delete mode 100644 files/common/infrastructure-testing.repo
delete mode 100644 files/common/infrastructure.repo
delete mode 100644 files/common/rhel6.repo
delete mode 100644 files/common/rhel7.repo
create mode 100644 roles/yumrepos/files/epel6.repo
create mode 100644 roles/yumrepos/files/epel7.repo
create mode 100644 roles/yumrepos/files/fedora-updates-testing.repo
create mode 100644 roles/yumrepos/files/fedora-updates-testing.repo-secondary
create mode 100644 roles/yumrepos/files/fedora-updates.repo
create mode 100644 roles/yumrepos/files/fedora-updates.repo-secondary
create mode 100644 roles/yumrepos/files/fedora.repo
create mode 100644 roles/yumrepos/files/fedora.repo-secondary
create mode 100644 roles/yumrepos/files/infrastructure-testing.repo
create mode 100644 roles/yumrepos/files/infrastructure.repo
create mode 100644 roles/yumrepos/files/rhel6.repo
create mode 100644 roles/yumrepos/files/rhel7.repo
create mode 100644 roles/yumrepos/tasks/yumrepos.yml
delete mode 100644 tasks/yumrepos.yml
diff --git a/files/common/epel6.repo b/files/common/epel6.repo
deleted file mode 100644
index d195e79..0000000
--- a/files/common/epel6.repo
+++ /dev/null
@@ -1,13 +0,0 @@
-[epel]
-name=Extras Packages for Enterprise Linux $releasever - $basearch
-baseurl=http://infrastructure.fedoraproject.org/pub/epel/6/$basearch/
-enabled=1
-gpgcheck=1
-gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6
-
-[epel-testing]
-name=Extras Packages for Enterprise Linux $releasever - $basearch
-baseurl=http://infrastructure.fedoraproject.org/pub/epel/testing/6/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6
diff --git a/files/common/epel7.repo b/files/common/epel7.repo
deleted file mode 100644
index 6dc4c93..0000000
--- a/files/common/epel7.repo
+++ /dev/null
@@ -1,20 +0,0 @@
-[epel]
-name=Extras Packages for Enterprise Linux $releasever - $basearch
-baseurl=http://infrastructure.fedoraproject.org/pub/epel/7/$basearch/
-enabled=1
-gpgcheck=1
-gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
-
-[epel-testing]
-name=Extras Packages for Enterprise Linux $releasever - $basearch
-baseurl=http://infrastructure.fedoraproject.org/pub/epel/testing/7/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
-
-[epel-beta]
-name=Extras Packages for Enterprise Linux beta $releasever - $basearch
-baseurl=http://infrastructure.fedoraproject.org/pub/epel/beta/7/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
diff --git a/files/common/fedora-updates-testing.repo
b/files/common/fedora-updates-testing.repo
deleted file mode 100644
index 5b195dc..0000000
--- a/files/common/fedora-updates-testing.repo
+++ /dev/null
@@ -1,26 +0,0 @@
-[updates-testing]
-name=Fedora $releasever - $basearch - Test Updates
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-[updates-testing-debuginfo]
-name=Fedora $releasever - $basearch - Test Updates Debug
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/debug/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-[updates-testing-source]
-name=Fedora $releasever - Test Updates Source
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/SRPMS/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-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.repo-secondary
b/files/common/fedora-updates-testing.repo-secondary
deleted file mode 100644
index 4359d0a..0000000
--- a/files/common/fedora-updates-testing.repo-secondary
+++ /dev/null
@@ -1,26 +0,0 @@
-[updates-testing]
-name=Fedora $releasever - $basearch - Test Updates
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/$basearch/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-[updates-testing-debuginfo]
-name=Fedora $releasever - $basearch - Test Updates Debug
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/$basearch/debug/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-[updates-testing-source]
-name=Fedora $releasever - Test Updates Source
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/SRPMS/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-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.repo b/files/common/fedora-updates.repo
deleted file mode 100644
index ee6b7c8..0000000
--- a/files/common/fedora-updates.repo
+++ /dev/null
@@ -1,26 +0,0 @@
-[updates]
-name=Fedora $releasever - $basearch - Updates
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-[updates-debuginfo]
-name=Fedora $releasever - $basearch - Updates - Debug
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/debug/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-[updates-source]
-name=Fedora $releasever - Updates Source
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/SRPMS/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-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.repo-secondary
b/files/common/fedora-updates.repo-secondary
deleted file mode 100644
index bbd9f34..0000000
--- a/files/common/fedora-updates.repo-secondary
+++ /dev/null
@@ -1,26 +0,0 @@
-[updates]
-name=Fedora $releasever - $basearch - Updates
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/$basearch/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-[updates-debuginfo]
-name=Fedora $releasever - $basearch - Updates - Debug
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/$basearch/debug/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-[updates-source]
-name=Fedora $releasever - Updates Source
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/SRPMS/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-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.repo b/files/common/fedora.repo
deleted file mode 100644
index 0d5b908..0000000
--- a/files/common/fedora.repo
+++ /dev/null
@@ -1,29 +0,0 @@
-[fedora]
-name=Fedora $releasever - $basearch
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-enabled=1
-metadata_expire=7d
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-[fedora-debuginfo]
-name=Fedora $releasever - $basearch - Debug
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-[fedora-source]
-name=Fedora $releasever - Source
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-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.repo-secondary b/files/common/fedora.repo-secondary
deleted file mode 100644
index fcd67ed..0000000
--- a/files/common/fedora.repo-secondary
+++ /dev/null
@@ -1,29 +0,0 @@
-[fedora]
-name=Fedora $releasever - $basearch
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-enabled=1
-metadata_expire=7d
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-[fedora-debuginfo]
-name=Fedora $releasever - $basearch - Debug
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/debug/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-[fedora-source]
-name=Fedora $releasever - Source
-failovermethod=priority
-baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/source/SRPMS/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-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/infrastructure-testing.repo
b/files/common/infrastructure-testing.repo
deleted file mode 100644
index 501bc65..0000000
--- a/files/common/infrastructure-testing.repo
+++ /dev/null
@@ -1,7 +0,0 @@
-[infrastructure-testing]
-name=Extras Packages from Fedora Infrastructure $releasever - $basearch - Testing
-baseurl=http://infrastructure.fedoraproject.org/repo/testing/$releasever/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=http://infrastructure.fedoraproject.org/repo/RPM-GPG-KEY-INFRASTRUCTURE
-
diff --git a/files/common/infrastructure.repo b/files/common/infrastructure.repo
deleted file mode 100644
index 98ceb3f..0000000
--- a/files/common/infrastructure.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[infrastructure]
-name=Extras Packages from Fedora Infrastructure $releasever - $basearch
-baseurl=http://infrastructure.fedoraproject.org/repo/$releasever/$basearch/
-enabled=1
-gpgcheck=1
-gpgkey=http://infrastructure.fedoraproject.org/repo/RPM-GPG-KEY-INFRASTRUCTURE
diff --git a/files/common/rhel6.repo b/files/common/rhel6.repo
deleted file mode 100644
index 3c533fa..0000000
--- a/files/common/rhel6.repo
+++ /dev/null
@@ -1,14 +0,0 @@
-[rhel6-dvd]
-name = rhel6 base dvd
-baseurl=http://infrastructure.fedoraproject.org/repo/rhel/RHEL6-$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-
-[rhel6-base]
-name = rhel6 base $basearch
-baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel-$basearch-server-6/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-
-[rhel6-optional]
-name = rhel6 optional $basearch
-baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel-$basearch-server-optional-6/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
diff --git a/files/common/rhel7.repo b/files/common/rhel7.repo
deleted file mode 100644
index c76f2a9..0000000
--- a/files/common/rhel7.repo
+++ /dev/null
@@ -1,24 +0,0 @@
-[rhel7-dvd]
-name = rhel7 base dvd
-baseurl=http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-
-[rhel7-base]
-name = rhel7 base $basearch
-baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-server-rpms
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-
-[rhel7-optional]
-name = rhel7 optional $basearch
-baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-server-optional-rpms
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-
-[rhel7-extras]
-name = rhel7 extras $basearch
-baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-server-extras-rpms
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-
-[rhel7-ha]
-name = rhel7 ha $basearch
-baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-ha-for-rhel-7-server-rpms/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
diff --git a/playbooks/groups/anitya.yml b/playbooks/groups/anitya.yml
index 3d290d4..a41e619 100644
--- a/playbooks/groups/anitya.yml
+++ b/playbooks/groups/anitya.yml
@@ -22,7 +22,6 @@
- openvpn/client
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/arm-packager.yml b/playbooks/groups/arm-packager.yml
index 7934373..165123d 100644
--- a/playbooks/groups/arm-packager.yml
+++ b/playbooks/groups/arm-packager.yml
@@ -11,9 +11,6 @@
- "/srv/private/ansible/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
- pre_tasks:
- - include: "{{ tasks }}/yumrepos.yml"
-
roles:
- base
- rkhunter
diff --git a/playbooks/groups/arm-qa.yml b/playbooks/groups/arm-qa.yml
index 864bab2..d88a413 100644
--- a/playbooks/groups/arm-qa.yml
+++ b/playbooks/groups/arm-qa.yml
@@ -11,9 +11,6 @@
- "/srv/private/ansible/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
- pre_tasks:
- - include: "{{ tasks }}/yumrepos.yml"
-
roles:
- base
- rkhunter
diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml
index e52b1fb..3036f4a 100644
--- a/playbooks/groups/ask.yml
+++ b/playbooks/groups/ask.yml
@@ -26,7 +26,6 @@
when: env != "staging" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/atomic.yml b/playbooks/groups/atomic.yml
index eb13349..b0ed5a8 100644
--- a/playbooks/groups/atomic.yml
+++ b/playbooks/groups/atomic.yml
@@ -19,7 +19,6 @@
- sudo
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/autocloud-backend.yml
b/playbooks/groups/autocloud-backend.yml
index adbbed5..196c387 100644
--- a/playbooks/groups/autocloud-backend.yml
+++ b/playbooks/groups/autocloud-backend.yml
@@ -10,9 +10,6 @@
- "/srv/private/ansible/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
- pre_tasks:
- - include: "{{ tasks }}/yumrepos.yml"
-
roles:
- base
- rkhunter
diff --git a/playbooks/groups/autocloud-web.yml b/playbooks/groups/autocloud-web.yml
index 52c5ac4..fb75a60 100644
--- a/playbooks/groups/autocloud-web.yml
+++ b/playbooks/groups/autocloud-web.yml
@@ -10,9 +10,6 @@
- "/srv/private/ansible/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
- pre_tasks:
- - include: "{{ tasks }}/yumrepos.yml"
-
roles:
- base
- rkhunter
diff --git a/playbooks/groups/autosign.yml b/playbooks/groups/autosign.yml
index 269df8a..d9f56f1 100644
--- a/playbooks/groups/autosign.yml
+++ b/playbooks/groups/autosign.yml
@@ -25,7 +25,6 @@
- sudo
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml
index 59ca043..96eb1c4 100644
--- a/playbooks/groups/backup-server.yml
+++ b/playbooks/groups/backup-server.yml
@@ -28,7 +28,6 @@
- openvpn/client
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/rdiff_backup_server.yml"
diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml
index 4da9c3e..23cea87 100644
--- a/playbooks/groups/badges-backend.yml
+++ b/playbooks/groups/badges-backend.yml
@@ -28,7 +28,6 @@
when: env != "staging" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml
index cff2680..20fb0e8 100644
--- a/playbooks/groups/badges-web.yml
+++ b/playbooks/groups/badges-web.yml
@@ -39,7 +39,6 @@
interval: 10
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/basset.yml b/playbooks/groups/basset.yml
index 684b127..9848970 100644
--- a/playbooks/groups/basset.yml
+++ b/playbooks/groups/basset.yml
@@ -30,7 +30,6 @@
- basset/worker
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml
index 09e0bd5..5acd3ba 100644
--- a/playbooks/groups/bastion.yml
+++ b/playbooks/groups/bastion.yml
@@ -22,7 +22,6 @@
- { role: packager_alias, when: not
inventory_hostname.startswith('bastion-comm01') }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml
index 9badfc6..3dd390b 100644
--- a/playbooks/groups/batcave.yml
+++ b/playbooks/groups/batcave.yml
@@ -34,7 +34,6 @@
- { role: nfs/client, mnt_dir: '/mnt/fedora/app', nfs_src_dir:
'fedora_app/app' }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/beaker-stg.yml b/playbooks/groups/beaker-stg.yml
index ab1fa25..f2b5794 100644
--- a/playbooks/groups/beaker-stg.yml
+++ b/playbooks/groups/beaker-stg.yml
@@ -26,7 +26,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/beaker-virthosts.yml
b/playbooks/groups/beaker-virthosts.yml
index 98168ad..2c363ae 100644
--- a/playbooks/groups/beaker-virthosts.yml
+++ b/playbooks/groups/beaker-virthosts.yml
@@ -27,7 +27,6 @@
- { role: beaker/virthost, tags: ['beakervirthost'] }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml
index 8f57485..c9b4b0c 100644
--- a/playbooks/groups/beaker.yml
+++ b/playbooks/groups/beaker.yml
@@ -25,7 +25,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml
index 27d4b16..9ee5a55 100644
--- a/playbooks/groups/blockerbugs.yml
+++ b/playbooks/groups/blockerbugs.yml
@@ -26,7 +26,6 @@
- blockerbugs
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml
index 47a7f86..fc21aab 100644
--- a/playbooks/groups/bodhi-backend.yml
+++ b/playbooks/groups/bodhi-backend.yml
@@ -60,7 +60,6 @@
tags: bodhi
when: env == 'staging'
- include: "{{ tasks }}/2fa_client.yml"
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/motd.yml"
handlers:
diff --git a/playbooks/groups/bodhi2.yml b/playbooks/groups/bodhi2.yml
index cb08022..de772e7 100644
--- a/playbooks/groups/bodhi2.yml
+++ b/playbooks/groups/bodhi2.yml
@@ -27,7 +27,6 @@
- { role: nfs/client, when: datacenter == 'staging', mnt_dir:
'/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/bugyou.yml b/playbooks/groups/bugyou.yml
index c8bf246..b376ddd 100644
--- a/playbooks/groups/bugyou.yml
+++ b/playbooks/groups/bugyou.yml
@@ -25,7 +25,6 @@
- sudo
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml
index 6b1e17b..ab17d29 100644
--- a/playbooks/groups/bugzilla2fedmsg.yml
+++ b/playbooks/groups/bugzilla2fedmsg.yml
@@ -26,7 +26,6 @@
- fedmsg/base
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml
index bea92d5..7e9940a 100644
--- a/playbooks/groups/buildhw.yml
+++ b/playbooks/groups/buildhw.yml
@@ -13,7 +13,6 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
pre_tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/osbs_certs.yml"
roles:
diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index 694b3d7..620d4ba 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -16,7 +16,6 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
pre_tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/osbs_certs.yml"
roles:
diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml
index 0b66522..5c571c2 100644
--- a/playbooks/groups/busgateway.yml
+++ b/playbooks/groups/busgateway.yml
@@ -23,7 +23,6 @@
when: env != "staging" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/darkserver-backend.yml
b/playbooks/groups/darkserver-backend.yml
index 65b352f..72b832f 100644
--- a/playbooks/groups/darkserver-backend.yml
+++ b/playbooks/groups/darkserver-backend.yml
@@ -30,7 +30,6 @@
- role: apache
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/darkserver-web.yml b/playbooks/groups/darkserver-web.yml
index 24c3cff..a8b1950 100644
--- a/playbooks/groups/darkserver-web.yml
+++ b/playbooks/groups/darkserver-web.yml
@@ -30,7 +30,6 @@
- darkserver/web
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/darkserver.yml b/playbooks/groups/darkserver.yml
index 9e9ad51..6012600 100644
--- a/playbooks/groups/darkserver.yml
+++ b/playbooks/groups/darkserver.yml
@@ -33,7 +33,6 @@
- darkserver
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml
index 9e343c0..cf54b66 100644
--- a/playbooks/groups/datagrepper.yml
+++ b/playbooks/groups/datagrepper.yml
@@ -27,7 +27,6 @@
- apache
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/dhcp.yml b/playbooks/groups/dhcp.yml
index 55f2572..6b106b3 100644
--- a/playbooks/groups/dhcp.yml
+++ b/playbooks/groups/dhcp.yml
@@ -22,7 +22,6 @@
- tftp_server
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml
index 41ef279..ebb318d 100644
--- a/playbooks/groups/dns.yml
+++ b/playbooks/groups/dns.yml
@@ -25,7 +25,6 @@
- dns
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml
index c5e11a2..acd978c 100644
--- a/playbooks/groups/docker-registry.yml
+++ b/playbooks/groups/docker-registry.yml
@@ -22,7 +22,6 @@
- sudo
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/docs-backend.yml b/playbooks/groups/docs-backend.yml
index c7b1233..f44de5d 100644
--- a/playbooks/groups/docs-backend.yml
+++ b/playbooks/groups/docs-backend.yml
@@ -24,7 +24,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml
index b66fd31..f5e5ce8 100644
--- a/playbooks/groups/download.yml
+++ b/playbooks/groups/download.yml
@@ -43,7 +43,6 @@
- { role: openvpn/client, when: datacenter != "phx2" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
when: env != "staging"
diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml
index 756fc37..882810d 100644
--- a/playbooks/groups/elections.yml
+++ b/playbooks/groups/elections.yml
@@ -24,7 +24,6 @@
- collectd/base
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml
index bff9deb..bb70e0b 100644
--- a/playbooks/groups/fas.yml
+++ b/playbooks/groups/fas.yml
@@ -30,7 +30,6 @@
- { role: openvpn/client, when: env != "staging" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml
index 11ec717..8057da5 100644
--- a/playbooks/groups/fedimg.yml
+++ b/playbooks/groups/fedimg.yml
@@ -28,7 +28,6 @@
# when: env != "staging" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml
index 3bee8ea..72a92e2 100644
--- a/playbooks/groups/fedocal.yml
+++ b/playbooks/groups/fedocal.yml
@@ -24,7 +24,6 @@
- collectd/base
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/gallery.yml b/playbooks/groups/gallery.yml
index 937d5d7..99c9089 100644
--- a/playbooks/groups/gallery.yml
+++ b/playbooks/groups/gallery.yml
@@ -27,7 +27,6 @@
- collectd/base
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml
index ac8264a..0c96f8c 100644
--- a/playbooks/groups/github2fedmsg.yml
+++ b/playbooks/groups/github2fedmsg.yml
@@ -29,7 +29,6 @@
- apache
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/gnome-backups.yml b/playbooks/groups/gnome-backups.yml
index 9fc3dac..597fe7c 100644
--- a/playbooks/groups/gnome-backups.yml
+++ b/playbooks/groups/gnome-backups.yml
@@ -25,7 +25,6 @@
nfs_src_dir: 'gnome_backups' }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/hosted.yml b/playbooks/groups/hosted.yml
index 5679dd2..d71a899 100644
--- a/playbooks/groups/hosted.yml
+++ b/playbooks/groups/hosted.yml
@@ -21,7 +21,6 @@
- openvpn/client
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/hotness.yml b/playbooks/groups/hotness.yml
index 0ccfadb..0a6d6ff 100644
--- a/playbooks/groups/hotness.yml
+++ b/playbooks/groups/hotness.yml
@@ -29,7 +29,6 @@
# when: env != "staging" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/infinote.yml b/playbooks/groups/infinote.yml
index c095f39..3e99405 100644
--- a/playbooks/groups/infinote.yml
+++ b/playbooks/groups/infinote.yml
@@ -29,7 +29,6 @@
- infinote
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml
index 5706119..554a655 100644
--- a/playbooks/groups/ipsilon.yml
+++ b/playbooks/groups/ipsilon.yml
@@ -28,7 +28,6 @@
- apache
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/jenkins-master.yml b/playbooks/groups/jenkins-master.yml
index bff399a..c2ab719 100644
--- a/playbooks/groups/jenkins-master.yml
+++ b/playbooks/groups/jenkins-master.yml
@@ -24,7 +24,6 @@
- include: "{{ tasks }}/cloud_setup_basic.yml"
- name: set hostname (required by some services, at least postfix need it)
shell: "hostname {{inventory_hostname}}"
- - include: "{{ tasks }}/yumrepos.yml"
- name: provision instance
hosts: jenkins-master
@@ -47,7 +46,6 @@
proxyurl: http://localhost:8080
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/motd.yml"
handlers:
diff --git a/playbooks/groups/jenkins-slave.yml b/playbooks/groups/jenkins-slave.yml
index 13d1d9a..c4c7a6e 100644
--- a/playbooks/groups/jenkins-slave.yml
+++ b/playbooks/groups/jenkins-slave.yml
@@ -24,7 +24,6 @@
- include: "{{ tasks }}/cloud_setup_basic.yml"
- name: set hostname (required by some services, at least postfix need it)
shell: "hostname {{inventory_hostname}}"
- - include: "{{ tasks }}/yumrepos.yml"
- name: provision instance
hosts: jenkins-slave
@@ -39,7 +38,6 @@
tasks:
# - include: "{{ tasks }}/growroot_cloud.yml"
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/motd.yml"
handlers:
diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml
index 46ec3b8..ff30646 100644
--- a/playbooks/groups/kerneltest.yml
+++ b/playbooks/groups/kerneltest.yml
@@ -29,7 +29,6 @@
- apache
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml
index 1de72c9..d074314 100644
--- a/playbooks/groups/keyserver.yml
+++ b/playbooks/groups/keyserver.yml
@@ -29,7 +29,6 @@
- keyserver
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml
index 21a5800..99a662b 100644
--- a/playbooks/groups/koji-hub.yml
+++ b/playbooks/groups/koji-hub.yml
@@ -93,7 +93,6 @@
file: src=/mnt/fedora_koji_prod/koji dest=/mnt/koji/vol/prod state=link
tags: koji_hub
when: env == 'staging'
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml
index 1801933..418699a 100644
--- a/playbooks/groups/kojipkgs.yml
+++ b/playbooks/groups/kojipkgs.yml
@@ -28,7 +28,6 @@
- kojipkgs
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/koschei.yml b/playbooks/groups/koschei.yml
index 0dce075..ef1ddbb 100644
--- a/playbooks/groups/koschei.yml
+++ b/playbooks/groups/koschei.yml
@@ -25,7 +25,6 @@
- { role: openvpn/client, when: env != "staging" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml
index c045a30..6ec23d3 100644
--- a/playbooks/groups/logserver.yml
+++ b/playbooks/groups/logserver.yml
@@ -25,7 +25,6 @@
- awstats
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml
index 471596a..b5fe9db 100644
--- a/playbooks/groups/mailman.yml
+++ b/playbooks/groups/mailman.yml
@@ -28,7 +28,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/mariadb-server.yml b/playbooks/groups/mariadb-server.yml
index ee038e0..10ccf73 100644
--- a/playbooks/groups/mariadb-server.yml
+++ b/playbooks/groups/mariadb-server.yml
@@ -27,7 +27,6 @@
- sudo
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/mdapi.yml b/playbooks/groups/mdapi.yml
index 0906f6b..c226304 100644
--- a/playbooks/groups/mdapi.yml
+++ b/playbooks/groups/mdapi.yml
@@ -23,7 +23,6 @@
- collectd/base
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml
index 0e0fea2..e30b936 100644
--- a/playbooks/groups/memcached.yml
+++ b/playbooks/groups/memcached.yml
@@ -22,7 +22,6 @@
- memcached
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml
index 248cf4f..689ea69 100644
--- a/playbooks/groups/mirrorlist2.yml
+++ b/playbooks/groups/mirrorlist2.yml
@@ -92,7 +92,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml
index c535ad2..fea2e48 100644
--- a/playbooks/groups/mirrormanager.yml
+++ b/playbooks/groups/mirrormanager.yml
@@ -22,7 +22,6 @@
- { role: nfs/client, when: inventory_hostname.startswith('mm-backend01'),
mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml
index 1d426ad..213524c 100644
--- a/playbooks/groups/noc.yml
+++ b/playbooks/groups/noc.yml
@@ -24,7 +24,6 @@
- apache
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml
index 50763ad..a234903 100644
--- a/playbooks/groups/notifs-backend.yml
+++ b/playbooks/groups/notifs-backend.yml
@@ -30,7 +30,6 @@
# when: env != "staging" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml
index afb8c7f..85ef472 100644
--- a/playbooks/groups/notifs-web.yml
+++ b/playbooks/groups/notifs-web.yml
@@ -30,7 +30,6 @@
when: env != "staging" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml
index 1d48752..24fe19b 100644
--- a/playbooks/groups/nuancier.yml
+++ b/playbooks/groups/nuancier.yml
@@ -28,7 +28,6 @@
- apache
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/openqa-workers.yml b/playbooks/groups/openqa-workers.yml
index a41e7ae..b955365 100644
--- a/playbooks/groups/openqa-workers.yml
+++ b/playbooks/groups/openqa-workers.yml
@@ -20,7 +20,6 @@
- apache
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml
index 06ff236..a438f83 100644
--- a/playbooks/groups/openqa.yml
+++ b/playbooks/groups/openqa.yml
@@ -23,7 +23,6 @@
- apache
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/openstack-compute-nodes.yml
b/playbooks/groups/openstack-compute-nodes.yml
index af154f6..0af75e9 100644
--- a/playbooks/groups/openstack-compute-nodes.yml
+++ b/playbooks/groups/openstack-compute-nodes.yml
@@ -21,7 +21,6 @@
- cloud_compute
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml
index 79b90f8..b615ea6 100644
--- a/playbooks/groups/osbs-master.yml
+++ b/playbooks/groups/osbs-master.yml
@@ -22,7 +22,6 @@
- sudo
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml
index 81e8997..1dac9d6 100644
--- a/playbooks/groups/packages.yml
+++ b/playbooks/groups/packages.yml
@@ -29,7 +29,6 @@
- apache
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml
index a1a9a1b..5ea9f33 100644
--- a/playbooks/groups/pagure.yml
+++ b/playbooks/groups/pagure.yml
@@ -22,7 +22,6 @@
- postgresql_server
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/paste.yml b/playbooks/groups/paste.yml
index b58b653..58b1b09 100644
--- a/playbooks/groups/paste.yml
+++ b/playbooks/groups/paste.yml
@@ -25,7 +25,6 @@
when: env != "staging" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml
index 49e0fe1..2bcffbf 100644
--- a/playbooks/groups/pdc.yml
+++ b/playbooks/groups/pdc.yml
@@ -23,7 +23,6 @@
- sudo
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml
index 98145f7..3eb3008 100644
--- a/playbooks/groups/people.yml
+++ b/playbooks/groups/people.yml
@@ -83,7 +83,6 @@
- people
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml
index 95b70ff..be85fc5 100644
--- a/playbooks/groups/pkgdb.yml
+++ b/playbooks/groups/pkgdb.yml
@@ -27,7 +27,6 @@
- apache
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml
index 0f810d4..f45e8fc 100644
--- a/playbooks/groups/pkgs.yml
+++ b/playbooks/groups/pkgs.yml
@@ -32,7 +32,6 @@
tags: distgit
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/2fa_client.yml"
diff --git a/playbooks/groups/postgresql-server.yml
b/playbooks/groups/postgresql-server.yml
index 8cf1d86..33229d1 100644
--- a/playbooks/groups/postgresql-server.yml
+++ b/playbooks/groups/postgresql-server.yml
@@ -29,7 +29,6 @@
- { role: openvpn/client, when: inventory_hostname ==
"db-fas01.phx2.fedoraproject.org" or inventory_hostname ==
"db01.phx2.fedoraproject.org" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml
index 4169be2..27355ed 100644
--- a/playbooks/groups/proxies.yml
+++ b/playbooks/groups/proxies.yml
@@ -24,7 +24,6 @@
- apache
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/qa-stg.yml b/playbooks/groups/qa-stg.yml
index fcc3d34..67e9ff2 100644
--- a/playbooks/groups/qa-stg.yml
+++ b/playbooks/groups/qa-stg.yml
@@ -27,7 +27,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/qadevel.yml b/playbooks/groups/qadevel.yml
index 3e0e89e..70b9003 100644
--- a/playbooks/groups/qadevel.yml
+++ b/playbooks/groups/qadevel.yml
@@ -27,7 +27,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml
index 2cf5022..0d7ba83 100644
--- a/playbooks/groups/releng-compose.yml
+++ b/playbooks/groups/releng-compose.yml
@@ -38,7 +38,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/common_scripts.yml"
diff --git a/playbooks/groups/resultsdb-dev.yml b/playbooks/groups/resultsdb-dev.yml
index 3b6fdb3..cca9f24 100644
--- a/playbooks/groups/resultsdb-dev.yml
+++ b/playbooks/groups/resultsdb-dev.yml
@@ -28,7 +28,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/resultsdb-prod.yml b/playbooks/groups/resultsdb-prod.yml
index 8d53865..65d2a3a 100644
--- a/playbooks/groups/resultsdb-prod.yml
+++ b/playbooks/groups/resultsdb-prod.yml
@@ -29,7 +29,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/resultsdb-stg.yml b/playbooks/groups/resultsdb-stg.yml
index 4cacbbd..82bc473 100644
--- a/playbooks/groups/resultsdb-stg.yml
+++ b/playbooks/groups/resultsdb-stg.yml
@@ -28,7 +28,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml
index 4b488a9..605dbbb 100644
--- a/playbooks/groups/retrace.yml
+++ b/playbooks/groups/retrace.yml
@@ -21,7 +21,6 @@
tasks:
- include: "{{ tasks }}/2fa_client.yml"
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/common_scripts.yml"
diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml
index 8ded595..8c37885 100644
--- a/playbooks/groups/secondary.yml
+++ b/playbooks/groups/secondary.yml
@@ -48,7 +48,6 @@
- archive.fedoraproject.org
- archives.fedoraproject.org
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/sign-bridge.yml b/playbooks/groups/sign-bridge.yml
index ac1167c..b5daf5c 100644
--- a/playbooks/groups/sign-bridge.yml
+++ b/playbooks/groups/sign-bridge.yml
@@ -27,7 +27,6 @@
tasks:
- include: "{{ tasks }}/motd.yml"
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/sign_setup.yml"
diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml
index 44db455..f29aa4e 100644
--- a/playbooks/groups/smtp-mm.yml
+++ b/playbooks/groups/smtp-mm.yml
@@ -24,7 +24,6 @@
when: env != "staging" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/statscache.yml b/playbooks/groups/statscache.yml
index 3d1cd1e..1471ecd 100644
--- a/playbooks/groups/statscache.yml
+++ b/playbooks/groups/statscache.yml
@@ -27,7 +27,6 @@
- sudo
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/summershum.yml b/playbooks/groups/summershum.yml
index 77df8ca..9e88b37 100644
--- a/playbooks/groups/summershum.yml
+++ b/playbooks/groups/summershum.yml
@@ -29,7 +29,6 @@
# when: env != "staging" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml
index 49cdcc4..d8eb78a 100644
--- a/playbooks/groups/sundries.yml
+++ b/playbooks/groups/sundries.yml
@@ -51,7 +51,6 @@
when: master_sundries_node
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml
index ab32b1c..2ba8c43 100644
--- a/playbooks/groups/tagger.yml
+++ b/playbooks/groups/tagger.yml
@@ -29,7 +29,6 @@
- apache
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/groups/taskotron-client-hosts.yml
b/playbooks/groups/taskotron-client-hosts.yml
index f395df7..24390e0 100644
--- a/playbooks/groups/taskotron-client-hosts.yml
+++ b/playbooks/groups/taskotron-client-hosts.yml
@@ -26,7 +26,6 @@
- { role: openvpn/client, when: datacenter != "phx2" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/taskotron-dev.yml b/playbooks/groups/taskotron-dev.yml
index 36b2e9b..c2463f4 100644
--- a/playbooks/groups/taskotron-dev.yml
+++ b/playbooks/groups/taskotron-dev.yml
@@ -28,7 +28,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/taskotron-prod.yml b/playbooks/groups/taskotron-prod.yml
index 633feaf..99566de 100644
--- a/playbooks/groups/taskotron-prod.yml
+++ b/playbooks/groups/taskotron-prod.yml
@@ -29,7 +29,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/taskotron-stg.yml b/playbooks/groups/taskotron-stg.yml
index 1c5ff49..107dd5e 100644
--- a/playbooks/groups/taskotron-stg.yml
+++ b/playbooks/groups/taskotron-stg.yml
@@ -27,7 +27,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml
index aacc296..61bcf7a 100644
--- a/playbooks/groups/taskotron.yml
+++ b/playbooks/groups/taskotron.yml
@@ -30,7 +30,6 @@
tasks:
# this is how you include other task lists
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/torrent.yml b/playbooks/groups/torrent.yml
index 295ad85..5f36573 100644
--- a/playbooks/groups/torrent.yml
+++ b/playbooks/groups/torrent.yml
@@ -35,7 +35,6 @@
sslonly: true
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml
index 068c416..aa99baf 100644
--- a/playbooks/groups/unbound.yml
+++ b/playbooks/groups/unbound.yml
@@ -23,7 +23,6 @@
when: env != "staging" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml
index fd1e84f..011b73e 100644
--- a/playbooks/groups/value.yml
+++ b/playbooks/groups/value.yml
@@ -30,7 +30,6 @@
- mote
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml
index 14f1ee5..6516c2a 100644
--- a/playbooks/groups/virthost.yml
+++ b/playbooks/groups/virthost.yml
@@ -25,7 +25,6 @@
- virthost
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml
index 1015c8e..59db523 100644
--- a/playbooks/groups/wiki.yml
+++ b/playbooks/groups/wiki.yml
@@ -33,7 +33,6 @@
when: env != "staging" }
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/groups/zanata2fedmsg.yml b/playbooks/groups/zanata2fedmsg.yml
index c23a9a2..684a887 100644
--- a/playbooks/groups/zanata2fedmsg.yml
+++ b/playbooks/groups/zanata2fedmsg.yml
@@ -29,7 +29,6 @@
- apache
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml
b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml
index 73fe45c..feab01f 100644
--- a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml
@@ -22,7 +22,6 @@
- tftp_server
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
index 102b0cc..2cc1683 100644
--- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
+++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
@@ -10,9 +10,6 @@
- "/srv/private/ansible/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
- pre_tasks:
- - include: "{{ tasks }}/yumrepos.yml"
-
roles:
- base
- rkhunter
diff --git a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml
b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml
index f63d610..eeed341 100644
--- a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml
@@ -20,8 +20,9 @@
- /srv/private/ansible/files/openstack/passwords.yml
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+ roles:
+ - base
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/motd.yml"
handlers:
diff --git a/playbooks/hosts/fedora-hubs-dev.yml b/playbooks/hosts/fedora-hubs-dev.yml
index 2fef43d..5f14424 100644
--- a/playbooks/hosts/fedora-hubs-dev.yml
+++ b/playbooks/hosts/fedora-hubs-dev.yml
@@ -8,8 +8,9 @@
- "/srv/private/ansible/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+ roles:
+ - base
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
- yum: name={{item}} state=present
with_items:
- git
diff --git a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml
b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml
index d6448d9..5611734 100644
--- a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml
@@ -30,7 +30,6 @@
- graphite/grafana
tasks:
- - include: "{{ tasks }}/yumrepos.yml"
#- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
index 3c51578..c4cd128 100644
--- a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
@@ -37,7 +37,6 @@
tasks:
- include: "{{ tasks }}/postfix_basic.yml"
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks }}/mod_wsgi.yml"
diff --git a/playbooks/hosts/piwik.fedorainfracloud.org.yml
b/playbooks/hosts/piwik.fedorainfracloud.org.yml
index d171f25..dc165b8 100644
--- a/playbooks/hosts/piwik.fedorainfracloud.org.yml
+++ b/playbooks/hosts/piwik.fedorainfracloud.org.yml
@@ -21,15 +21,12 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles:
+ - base
- sudo
- hosts
- apache
- - base
- piwik
- pre_tasks:
- - include: "{{ tasks }}/yumrepos.yml"
-
tasks:
- include: "{{ tasks }}/cloud_setup_basic.yml"
- name: set hostname (required by some services, at least postfix need it)
diff --git a/playbooks/manual/qadevel.yml b/playbooks/manual/qadevel.yml
index 6105d36..0e78934 100644
--- a/playbooks/manual/qadevel.yml
+++ b/playbooks/manual/qadevel.yml
@@ -39,7 +39,6 @@
tasks:
- include: "{{ tasks }}/hosts.yml"
- - include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
diff --git a/roles/base/meta/main.yml b/roles/base/meta/main.yml
index 6ad8fad..f46468c 100644
--- a/roles/base/meta/main.yml
+++ b/roles/base/meta/main.yml
@@ -1,3 +1,4 @@
---
dependencies:
+ - { role: yumrepos }
- { role: dnf-automatic }
diff --git a/roles/yumrepos/files/epel6.repo b/roles/yumrepos/files/epel6.repo
new file mode 100644
index 0000000..d195e79
--- /dev/null
+++ b/roles/yumrepos/files/epel6.repo
@@ -0,0 +1,13 @@
+[epel]
+name=Extras Packages for Enterprise Linux $releasever - $basearch
+baseurl=http://infrastructure.fedoraproject.org/pub/epel/6/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6
+
+[epel-testing]
+name=Extras Packages for Enterprise Linux $releasever - $basearch
+baseurl=http://infrastructure.fedoraproject.org/pub/epel/testing/6/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6
diff --git a/roles/yumrepos/files/epel7.repo b/roles/yumrepos/files/epel7.repo
new file mode 100644
index 0000000..6dc4c93
--- /dev/null
+++ b/roles/yumrepos/files/epel7.repo
@@ -0,0 +1,20 @@
+[epel]
+name=Extras Packages for Enterprise Linux $releasever - $basearch
+baseurl=http://infrastructure.fedoraproject.org/pub/epel/7/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
+
+[epel-testing]
+name=Extras Packages for Enterprise Linux $releasever - $basearch
+baseurl=http://infrastructure.fedoraproject.org/pub/epel/testing/7/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
+
+[epel-beta]
+name=Extras Packages for Enterprise Linux beta $releasever - $basearch
+baseurl=http://infrastructure.fedoraproject.org/pub/epel/beta/7/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
diff --git a/roles/yumrepos/files/fedora-updates-testing.repo
b/roles/yumrepos/files/fedora-updates-testing.repo
new file mode 100644
index 0000000..5b195dc
--- /dev/null
+++ b/roles/yumrepos/files/fedora-updates-testing.repo
@@ -0,0 +1,26 @@
+[updates-testing]
+name=Fedora $releasever - $basearch - Test Updates
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-testing-debuginfo]
+name=Fedora $releasever - $basearch - Test Updates Debug
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/debug/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-testing-source]
+name=Fedora $releasever - Test Updates Source
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/SRPMS/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/roles/yumrepos/files/fedora-updates-testing.repo-secondary
b/roles/yumrepos/files/fedora-updates-testing.repo-secondary
new file mode 100644
index 0000000..4359d0a
--- /dev/null
+++ b/roles/yumrepos/files/fedora-updates-testing.repo-secondary
@@ -0,0 +1,26 @@
+[updates-testing]
+name=Fedora $releasever - $basearch - Test Updates
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/$basearch/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-testing-debuginfo]
+name=Fedora $releasever - $basearch - Test Updates Debug
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/$basearch/debug/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-testing-source]
+name=Fedora $releasever - Test Updates Source
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/SRPMS/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/roles/yumrepos/files/fedora-updates.repo
b/roles/yumrepos/files/fedora-updates.repo
new file mode 100644
index 0000000..ee6b7c8
--- /dev/null
+++ b/roles/yumrepos/files/fedora-updates.repo
@@ -0,0 +1,26 @@
+[updates]
+name=Fedora $releasever - $basearch - Updates
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-debuginfo]
+name=Fedora $releasever - $basearch - Updates - Debug
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/debug/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-source]
+name=Fedora $releasever - Updates Source
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/SRPMS/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/roles/yumrepos/files/fedora-updates.repo-secondary
b/roles/yumrepos/files/fedora-updates.repo-secondary
new file mode 100644
index 0000000..bbd9f34
--- /dev/null
+++ b/roles/yumrepos/files/fedora-updates.repo-secondary
@@ -0,0 +1,26 @@
+[updates]
+name=Fedora $releasever - $basearch - Updates
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/$basearch/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-debuginfo]
+name=Fedora $releasever - $basearch - Updates - Debug
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/$basearch/debug/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[updates-source]
+name=Fedora $releasever - Updates Source
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/updates/$releasever/SRPMS/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/roles/yumrepos/files/fedora.repo b/roles/yumrepos/files/fedora.repo
new file mode 100644
index 0000000..0d5b908
--- /dev/null
+++ b/roles/yumrepos/files/fedora.repo
@@ -0,0 +1,29 @@
+[fedora]
+name=Fedora $releasever - $basearch
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+enabled=1
+metadata_expire=7d
+gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[fedora-debuginfo]
+name=Fedora $releasever - $basearch - Debug
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[fedora-source]
+name=Fedora $releasever - Source
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-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/roles/yumrepos/files/fedora.repo-secondary
b/roles/yumrepos/files/fedora.repo-secondary
new file mode 100644
index 0000000..fcd67ed
--- /dev/null
+++ b/roles/yumrepos/files/fedora.repo-secondary
@@ -0,0 +1,29 @@
+[fedora]
+name=Fedora $releasever - $basearch
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/os/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+enabled=1
+metadata_expire=7d
+gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[fedora-debuginfo]
+name=Fedora $releasever - $basearch - Debug
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/debug/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+[fedora-source]
+name=Fedora $releasever - Source
+failovermethod=priority
+baseurl=http://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/source/SRPMS/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-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/roles/yumrepos/files/infrastructure-testing.repo
b/roles/yumrepos/files/infrastructure-testing.repo
new file mode 100644
index 0000000..501bc65
--- /dev/null
+++ b/roles/yumrepos/files/infrastructure-testing.repo
@@ -0,0 +1,7 @@
+[infrastructure-testing]
+name=Extras Packages from Fedora Infrastructure $releasever - $basearch - Testing
+baseurl=http://infrastructure.fedoraproject.org/repo/testing/$releasever/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=http://infrastructure.fedoraproject.org/repo/RPM-GPG-KEY-INFRASTRUCTURE
+
diff --git a/roles/yumrepos/files/infrastructure.repo
b/roles/yumrepos/files/infrastructure.repo
new file mode 100644
index 0000000..98ceb3f
--- /dev/null
+++ b/roles/yumrepos/files/infrastructure.repo
@@ -0,0 +1,6 @@
+[infrastructure]
+name=Extras Packages from Fedora Infrastructure $releasever - $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/$releasever/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=http://infrastructure.fedoraproject.org/repo/RPM-GPG-KEY-INFRASTRUCTURE
diff --git a/roles/yumrepos/files/rhel6.repo b/roles/yumrepos/files/rhel6.repo
new file mode 100644
index 0000000..3c533fa
--- /dev/null
+++ b/roles/yumrepos/files/rhel6.repo
@@ -0,0 +1,14 @@
+[rhel6-dvd]
+name = rhel6 base dvd
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/RHEL6-$basearch/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+
+[rhel6-base]
+name = rhel6 base $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel-$basearch-server-6/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+
+[rhel6-optional]
+name = rhel6 optional $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel-$basearch-server-optional-6/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
diff --git a/roles/yumrepos/files/rhel7.repo b/roles/yumrepos/files/rhel7.repo
new file mode 100644
index 0000000..c76f2a9
--- /dev/null
+++ b/roles/yumrepos/files/rhel7.repo
@@ -0,0 +1,24 @@
+[rhel7-dvd]
+name = rhel7 base dvd
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-$basearch/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+
+[rhel7-base]
+name = rhel7 base $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-server-rpms
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+
+[rhel7-optional]
+name = rhel7 optional $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-server-optional-rpms
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+
+[rhel7-extras]
+name = rhel7 extras $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-server-extras-rpms
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+
+[rhel7-ha]
+name = rhel7 ha $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-ha-for-rhel-7-server-rpms/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
diff --git a/roles/yumrepos/tasks/yumrepos.yml b/roles/yumrepos/tasks/yumrepos.yml
new file mode 100644
index 0000000..5403d70
--- /dev/null
+++ b/roles/yumrepos/tasks/yumrepos.yml
@@ -0,0 +1,50 @@
+---
+- name: put rhel repos on rhel systems
+ copy: src="rhel{{ ansible_distribution_major_version }}.repo"
dest="/etc/yum.repos.d/rhel{{ ansible_distribution_major_version }}.repo"
+ when: ansible_distribution == 'RedHat'
+ tags:
+ - config
+ - packages
+ - yumrepos
+
+- name: put epel repos on el systems
+ copy: src="epel{{ ansible_distribution_major_version }}.repo"
dest="/etc/yum.repos.d/epel{{ ansible_distribution_major_version }}.repo"
+ when: ((ansible_distribution == 'RedHat' or ansible_distribution ==
'CentOS') and use_default_epel)
+ tags:
+ - config
+ - packages
+ - yumrepos
+
+- name: put fedora repos on primary architecture systems
+ copy: src="{{ item }}" dest="/etc/yum.repos.d/{{ item }}"
+ with_items:
+ - fedora.repo
+ - fedora-updates.repo
+ - fedora-updates-testing.repo
+ when: ansible_distribution == 'Fedora' and (ansible_architecture ==
'x86_64' or ansible_architecture == 'i386' or ansible_architecture ==
'armv7l') and not inventory_hostname.startswith('arm03')
+ tags:
+ - config
+ - packages
+ - yumrepos
+
+- name: put fedora repos on secondary architecture systems
+ copy: src="{{ item }}-secondary" dest="/etc/yum.repos.d/{{ item
}}"
+ with_items:
+ - fedora.repo
+ - fedora-updates.repo
+ - fedora-updates-testing.repo
+ when: ansible_distribution == 'Fedora' and (ansible_architecture ==
'aarch64' or ansible_architecture == 'ppc64' or ansible_architecture ==
'ppc64le')
+ tags:
+ - config
+ - packages
+ - yumrepos
+
+- name: add infrastructure repo
+ copy: src="{{ item }}" dest="/etc/yum.repos.d/{{ item }}"
+ with_items:
+ - infrastructure.repo
+ - infrastructure-testing.repo
+ tags:
+ - config
+ - packages
+ - yumrepos
diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml
deleted file mode 100644
index e2be10b..0000000
--- a/tasks/yumrepos.yml
+++ /dev/null
@@ -1,50 +0,0 @@
----
-- name: put rhel repos on rhel systems
- copy: src="{{ files }}/common/rhel{{ ansible_distribution_major_version
}}.repo" dest="/etc/yum.repos.d/rhel{{ ansible_distribution_major_version
}}.repo"
- when: ansible_distribution == 'RedHat'
- tags:
- - config
- - packages
- - yumrepos
-
-- name: put epel repos on el systems
- copy: src="{{ files }}/common/epel{{ ansible_distribution_major_version
}}.repo" dest="/etc/yum.repos.d/epel{{ ansible_distribution_major_version
}}.repo"
- when: ((ansible_distribution == 'RedHat' or ansible_distribution ==
'CentOS') and use_default_epel)
- tags:
- - config
- - packages
- - yumrepos
-
-- name: put fedora repos on primary architecture systems
- copy: src="{{ files }}/common/{{ item }}" dest="/etc/yum.repos.d/{{ item
}}"
- with_items:
- - fedora.repo
- - fedora-updates.repo
- - fedora-updates-testing.repo
- when: ansible_distribution == 'Fedora' and (ansible_architecture ==
'x86_64' or ansible_architecture == 'i386' or ansible_architecture ==
'armv7l') and not inventory_hostname.startswith('arm03')
- tags:
- - config
- - packages
- - yumrepos
-
-- name: put fedora repos on secondary architecture systems
- copy: src="{{ files }}/common/{{ item }}-secondary"
dest="/etc/yum.repos.d/{{ item }}"
- with_items:
- - fedora.repo
- - fedora-updates.repo
- - fedora-updates-testing.repo
- when: ansible_distribution == 'Fedora' and (ansible_architecture ==
'aarch64' or ansible_architecture == 'ppc64' or ansible_architecture ==
'ppc64le')
- tags:
- - config
- - packages
- - yumrepos
-
-- name: add infrastructure repo
- copy: src="{{ files }}/common/{{ item }}" dest="/etc/yum.repos.d/{{ item
}}"
- with_items:
- - infrastructure.repo
- - infrastructure-testing.repo
- tags:
- - config
- - packages
- - yumrepos
--
1.8.3.1