summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2018-02-27 07:10:35 +0100
committerSuren A. Chilingaryan <csa@suren.me>2018-02-27 07:10:35 +0100
commit9ff59b4db572f63a78e2a35da95ac60d86a3a0c2 (patch)
tree57adf7bfecc8a1c2d637e1ba6088736fc234f168
parentec3bc59ab20c4c21b7cfd27065c1a9b811bd9518 (diff)
downloadopenshift-9ff59b4db572f63a78e2a35da95ac60d86a3a0c2.tar.gz
openshift-9ff59b4db572f63a78e2a35da95ac60d86a3a0c2.tar.bz2
openshift-9ff59b4db572f63a78e2a35da95ac60d86a3a0c2.tar.xz
openshift-9ff59b4db572f63a78e2a35da95ac60d86a3a0c2.zip
Allow upgrade to OpenShift 3.7.1
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml2
-rw-r--r--roles/openshift_repos/templates/CentOS-OpenShift-Origin371.repo.j226
2 files changed, 27 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml
index cc2ec2709..6c4ccf823 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 000000000..3118c7c24
--- /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