From fdb5bbcce60ca43fd82f69af543549450ca18c24 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 13 Apr 2016 16:56:00 +0000 Subject: [PATCH] fix repo definitions for epel vs fedora in osbs-install-openshift role Signed-off-by: Adam Miller --- .../maxamillion-epel-openshift.repo} | 4 ++-- .../files/maxamillion-fedora-openshift.repo | 8 ++++++++ roles/osbs-install-openshift/tasks/method_copr.yml | 11 +++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) rename roles/osbs-install-openshift/{templates/maxamillion-fedora-openshift.repo.j2 => files/maxamillion-epel-openshift.repo} (67%) create mode 100644 roles/osbs-install-openshift/files/maxamillion-fedora-openshift.repo diff --git a/roles/osbs-install-openshift/templates/maxamillion-fedora-openshift.repo.j2 b/roles/osbs-install-openshift/files/maxamillion-epel-openshift.repo similarity index 67% rename from roles/osbs-install-openshift/templates/maxamillion-fedora-openshift.repo.j2 rename to roles/osbs-install-openshift/files/maxamillion-epel-openshift.repo index c78dafd9cc..b3948bf875 100644 --- a/roles/osbs-install-openshift/templates/maxamillion-fedora-openshift.repo.j2 +++ b/roles/osbs-install-openshift/files/maxamillion-epel-openshift.repo @@ -1,8 +1,8 @@ [maxamillion-fedora-openshift] name=Copr repo for fedora-openshift owned by maxamillion -baseurl=https://copr-be.cloud.fedoraproject.org/results/maxamillion/fedora-openshift/{{ (ansible_distribution == "Fedora") | ternary("fedora", "epel") }}-{{ ansible_distribution_major_version }}-$basearch/ +baseurl=https://copr-be.cloud.fedoraproject.org/results/maxamillion/fedora-openshift/epel-7-$basearch/ skip_if_unavailable=True gpgcheck=1 gpgkey=https://copr-be.cloud.fedoraproject.org/results/maxamillion/fedora-openshift/pubkey.gpg enabled=1 - +enabled_metadata=1 \ No newline at end of file diff --git a/roles/osbs-install-openshift/files/maxamillion-fedora-openshift.repo b/roles/osbs-install-openshift/files/maxamillion-fedora-openshift.repo new file mode 100644 index 0000000000..c6b4d4a9d6 --- /dev/null +++ b/roles/osbs-install-openshift/files/maxamillion-fedora-openshift.repo @@ -0,0 +1,8 @@ +[maxamillion-fedora-openshift] +name=Copr repo for fedora-openshift owned by maxamillion +baseurl=https://copr-be.cloud.fedoraproject.org/results/maxamillion/fedora-openshift/fedora-$releasever-$basearch/ +skip_if_unavailable=True +gpgcheck=1 +gpgkey=https://copr-be.cloud.fedoraproject.org/results/maxamillion/fedora-openshift/pubkey.gpg +enabled=1 +enabled_metadata=1 diff --git a/roles/osbs-install-openshift/tasks/method_copr.yml b/roles/osbs-install-openshift/tasks/method_copr.yml index a75b72d6aa..d507367cd1 100644 --- a/roles/osbs-install-openshift/tasks/method_copr.yml +++ b/roles/osbs-install-openshift/tasks/method_copr.yml @@ -1,8 +1,15 @@ --- - name: setup repository - template: - src: maxamillion-fedora-openshift.repo.j2 + copy: + src: maxamillion-fedora-openshift.repo dest: /etc/yum.repos.d/maxamillion-fedora-openshift.repo + when: is_fedora is defined + +- name: setup repository + copy: + src: maxamillion-epel-openshift.repo + dest: /etc/yum.repos.d/maxamillion-epel-openshift.repo + when: is_rhel is defined - name: install openshift action: "{{ ansible_pkg_mgr }} name={{ item }} state={{ osbs_update_packages | ternary('latest', 'present') }}"