fix repo definitions for epel vs fedora in osbs-install-openshift role
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
parent
2f0192ebe9
commit
fdb5bbcce6
3 changed files with 19 additions and 4 deletions
|
@ -1,8 +1,8 @@
|
||||||
[maxamillion-fedora-openshift]
|
[maxamillion-fedora-openshift]
|
||||||
name=Copr repo for fedora-openshift owned by maxamillion
|
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
|
skip_if_unavailable=True
|
||||||
gpgcheck=1
|
gpgcheck=1
|
||||||
gpgkey=https://copr-be.cloud.fedoraproject.org/results/maxamillion/fedora-openshift/pubkey.gpg
|
gpgkey=https://copr-be.cloud.fedoraproject.org/results/maxamillion/fedora-openshift/pubkey.gpg
|
||||||
enabled=1
|
enabled=1
|
||||||
|
enabled_metadata=1
|
|
@ -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
|
|
@ -1,8 +1,15 @@
|
||||||
---
|
---
|
||||||
- name: setup repository
|
- name: setup repository
|
||||||
template:
|
copy:
|
||||||
src: maxamillion-fedora-openshift.repo.j2
|
src: maxamillion-fedora-openshift.repo
|
||||||
dest: /etc/yum.repos.d/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
|
- name: install openshift
|
||||||
action: "{{ ansible_pkg_mgr }} name={{ item }} state={{ osbs_update_packages | ternary('latest', 'present') }}"
|
action: "{{ ansible_pkg_mgr }} name={{ item }} state={{ osbs_update_packages | ternary('latest', 'present') }}"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue