summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@fedoraproject.org>2017-01-19 07:35:18 +0000
committerPeter Robinson <pbrobinson@fedoraproject.org>2017-01-19 07:35:18 +0000
commit89973aad74ff1d6d1002f349f5d0a09973445871 (patch)
treeeb7b5c7e575885fa178ae29af935ca991c0ab2e6 /roles
parent41e16ad43b1c80e7ab4327a06e5bd7cc8cb36894 (diff)
downloadansible-89973aad74ff1d6d1002f349f5d0a09973445871.tar.gz
ansible-89973aad74ff1d6d1002f349f5d0a09973445871.tar.xz
ansible-89973aad74ff1d6d1002f349f5d0a09973445871.zip
el7: aarch64: we now have proper EPEL/virt stacks so stop using our own
Diffstat (limited to 'roles')
-rw-r--r--roles/virthost/files/rhel7-aarch64extras.repo14
-rw-r--r--roles/virthost/files/rhel7-rhev-aarch64.repo6
-rw-r--r--roles/virthost/tasks/main.yml8
3 files changed, 10 insertions, 18 deletions
diff --git a/roles/virthost/files/rhel7-aarch64extras.repo b/roles/virthost/files/rhel7-aarch64extras.repo
deleted file mode 100644
index d316b196e..000000000
--- a/roles/virthost/files/rhel7-aarch64extras.repo
+++ /dev/null
@@ -1,14 +0,0 @@
-[rhel7-aarch64-extras]
-name=Extra bits that don't currently ship in RHELSA 7.2
-baseurl=http://infrastructure.fedoraproject.org/repo/rhel/aarch64-virt/
-enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-gpgcheck=0
-
-[epel]
-name=Extras Packages for Enterprise Linux $releasever - x86_64
-baseurl=http://infrastructure.fedoraproject.org/pub/epel/7/x86_64/
-enabled=1
-gpgcheck=1
-gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
-
diff --git a/roles/virthost/files/rhel7-rhev-aarch64.repo b/roles/virthost/files/rhel7-rhev-aarch64.repo
new file mode 100644
index 000000000..ccd2a8851
--- /dev/null
+++ b/roles/virthost/files/rhel7-rhev-aarch64.repo
@@ -0,0 +1,6 @@
+[rhel-7-server-rhv-4-aarch64]
+name=rhel7 os $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-kvm-rpms
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck=1
diff --git a/roles/virthost/tasks/main.yml b/roles/virthost/tasks/main.yml
index 21d597d21..94f159bb5 100644
--- a/roles/virthost/tasks/main.yml
+++ b/roles/virthost/tasks/main.yml
@@ -21,18 +21,18 @@
- rhel7-os-repo
when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 and ansible_architecture == 'x86_64'
-- name: install RHEV for el7 repo file
+- name: install RHEV/ppc64le for el7 repo file
copy: src=rhel7-rhev-ppc64le.repo dest=/etc/yum.repos.d/rhel7-rhev-ppc64le.repo
tags:
- repos
- rhel7-rhev-ppc64le
when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 and ansible_architecture == 'ppc64le'
-- name: install virt repo for el7 aarch64 file
- copy: src=rhel7-aarch64extras.repo dest=/etc/yum.repos.d/rhel7-aarch64extras.repo
+- name: install RHEV/aarch64 for el7 repo file
+ copy: src=rhel7-rhev-aarch64.repo dest=/etc/yum.repos.d/rhel7-rhev-aarch64.repo
tags:
- repos
- - rhel7-rhev-ppc64le
+ - rhel7-rhev-aarch64
when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 and ansible_architecture == 'aarch64'
- name: install libvirt packages on rhel7 virthosts