diff --git a/files/openshift/openshift.repo b/files/openshift/openshift.repo index af21a47a88..254f51b0a4 100644 --- a/files/openshift/openshift.repo +++ b/files/openshift/openshift.repo @@ -1,39 +1,13 @@ {% 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.10] -name = rhel7 openshift 3.10 $basearch -baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openshift-3.10-rpms/ -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -enabled=1 - [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/ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -enabled=0 - -# 3.8 is needed to upgrade from 3.7 to 3.9 -[rhel7-openshift-3.8] -name = rhel7 openshift 3.8 $basearch -baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openshift-3.8-rpms/ -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release -enabled=0 - -[rhel7-openshift-3.7] -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 -{% endif %} - -# OpenShift needs this for new openvswitch -[rhel7-fast-datapath] -name = rhel7 fast datapath $basearch -baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-fast-datapath/ +enabled=1 +{% elif inventory_hostname.startswith('os') %} +[rhel7-openshift-3.11] +name = rhel7 openshift 3.11 $basearch +baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openshift-3.11-rpms/ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release enabled=1 +{% endif %} diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index 17614d5706..f6683890d4 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.yml @@ -136,7 +136,7 @@ openshift_ansible_path: "/root/openshift-ansible", openshift_ansible_pre_playbook: "playbooks/prerequisites.yml", openshift_ansible_playbook: "playbooks/deploy_cluster.yml", - openshift_ansible_version: "openshift-ansible-3.10.51-1", + openshift_ansible_version: "openshift-ansible-3.11.38-1", openshift_ansible_ssh_user: root, openshift_ansible_install_examples: true, openshift_ansible_containerized_deploy: false,