From f9eff9e52638563f6ff75a8b3b1c07ebab80e12e Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Tue, 20 Mar 2018 15:43:00 +0100 Subject: Upgrade to 3.7.2 --- .../openshift-cluster/upgrades/v3_7/upgrade.yml | 2 +- .../templates/CentOS-OpenShift-Origin371.repo.j2 | 26 ---------------------- .../templates/CentOS-OpenShift-Origin372.repo.j2 | 26 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 roles/openshift_repos/templates/CentOS-OpenShift-Origin371.repo.j2 create mode 100644 roles/openshift_repos/templates/CentOS-OpenShift-Origin372.repo.j2 diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml index 6c4ccf823..731cf6831 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.1' + openshift_upgrade_target: '3.7.2' 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 deleted file mode 100644 index 10b49c041..000000000 --- a/roles/openshift_repos/templates/CentOS-OpenShift-Origin371.repo.j2 +++ /dev/null @@ -1,26 +0,0 @@ -[centos-openshift-origin371] -name=CentOS OpenShift Origin -baseurl={{ ands_repo_url }}/openshift371/ -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 diff --git a/roles/openshift_repos/templates/CentOS-OpenShift-Origin372.repo.j2 b/roles/openshift_repos/templates/CentOS-OpenShift-Origin372.repo.j2 new file mode 100644 index 000000000..03b758749 --- /dev/null +++ b/roles/openshift_repos/templates/CentOS-OpenShift-Origin372.repo.j2 @@ -0,0 +1,26 @@ +[centos-openshift-origin37x] +name=CentOS OpenShift Origin +baseurl={{ ands_repo_url }}/openshift37/ +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