From 65dbe970f3eff43d69b52f83b96785dbdb4b5a56 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 14 Jun 2018 23:18:44 +0000 Subject: [PATCH] rework this so hopefully it is now happy --- files/openshift/openshift.repo | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/files/openshift/openshift.repo b/files/openshift/openshift.repo index 7816512082..5a37adbdcb 100644 --- a/files/openshift/openshift.repo +++ b/files/openshift/openshift.repo @@ -1,4 +1,10 @@ -{% if inventory_hostname in groups['os', 'os-stg'] %} +{% if inventory_hostname.startswith('osbs') %} +[rhel7-openshift-3.6] +name = rhel7 openshift 3.6 $basearch +baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openshift-3.6-rpms/ +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +enabled=1 +{% elif inventory_hostname.startswith('os') %} [rhel7-openshift-3.9] name = rhel7 openshift 3.9 $basearch baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openshift-3.9-rpms/ @@ -17,13 +23,6 @@ name = rhel7 openshift 3.7 $basearch baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openshift-3.7-rpms/ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release enabled=0 -{% elif inventory_hostname in groups['osbs', 'osbs-stg'] %} - -[rhel7-openshift-3.6] -name = rhel7 openshift 3.6 $basearch -baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openshift-3.6-rpms/ -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -enabled=1 {% endif %} # OpenShift needs this for new openvswitch