From 0db2995395d28caf4676ab566085b7c66130b629 Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Sun, 11 Mar 2018 20:02:50 +0100 Subject: Add patches also for small modules --- .../openshift-ds-allow-upgrade-to-371.patch | 45 ---------------------- 1 file changed, 45 deletions(-) delete mode 100644 anslib/patches/openshift-ds-allow-upgrade-to-371.patch (limited to 'anslib/patches/openshift-ds-allow-upgrade-to-371.patch') diff --git a/anslib/patches/openshift-ds-allow-upgrade-to-371.patch b/anslib/patches/openshift-ds-allow-upgrade-to-371.patch deleted file mode 100644 index 2bae14e..0000000 --- a/anslib/patches/openshift-ds-allow-upgrade-to-371.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml -index cc2ec27..6c4ccf8 100644 ---- a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml -+++ b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml -@@ -12,7 +12,7 @@ - - pre_upgrade - tasks: - - set_fact: -- openshift_upgrade_target: '3.7' -+ openshift_upgrade_target: '3.7.1' - openshift_upgrade_min: '3.6' - - - import_playbook: ../pre/config.yml -diff --git a/roles/openshift_repos/templates/CentOS-OpenShift-Origin371.repo.j2 b/roles/openshift_repos/templates/CentOS-OpenShift-Origin371.repo.j2 -new file mode 100644 -index 0000000..3118c7c ---- /dev/null -+++ b/roles/openshift_repos/templates/CentOS-OpenShift-Origin371.repo.j2 -@@ -0,0 +1,26 @@ -+[centos-openshift-origin371] -+name=CentOS OpenShift Origin -+baseurl=http://ufo.kit.edu/ands/repos/openshift74/ -+enabled=1 -+gpgcheck=0 -+ -+[centos-openshift-origin37-testing] -+name=CentOS OpenShift Origin Testing -+baseurl=http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin37/ -+enabled={{ 1 if openshift_repos_enable_testing else 0 }} -+gpgcheck=0 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS -+ -+[centos-openshift-origin37-debuginfo] -+name=CentOS OpenShift Origin DebugInfo -+baseurl=http://debuginfo.centos.org/centos/7/paas/x86_64/ -+enabled=0 -+gpgcheck=1 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS -+ -+[centos-openshift-origin37-source] -+name=CentOS OpenShift Origin Source -+baseurl=http://vault.centos.org/centos/7/paas/Source/openshift-origin37/ -+enabled=0 -+gpgcheck=1 -+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS -- cgit v1.2.3