Skip to content

Commit 4315856

Browse files
authored
Merge pull request #341 from markllama/ocp-3.5
added rhel-7-fast-datapath-rpms to repo enable list for OCP3.5+
2 parents 4f4eee3 + 93253cf commit 4315856

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

README.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ subscription account used for installation.
105105
|rhel-7-server-extras-rpms | Supporting RPMs
106106
|rhel-7-server-optional-rpms | Supporting RPMs
107107
|rhel-7-server-openstack-10-rpms | OpenStack client and data collection RPMs
108-
|rhel-7-server-ose-3.4-rpms | OpenShift Container Platform RPMs
108+
|rhel-7-server-ose-3.5-rpms | OpenShift Container Platform RPMs
109+
|rhel-7-fast-datapath-rpms | Required for OSP 3.5+ and OVS 2.6+
109110
|===
110111

111112
== Creating an All-In-One Demo Environment

fragments/rhn-register.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,10 @@ retry subscription-manager repos \
8484
--enable="rhel-7-server-optional-rpms" \
8585
--enable="rhel-7-server-ose-$OCP_VERSION-rpms"
8686

87+
# version 3.5+ require fast-datapath
88+
if [ $(expr "$OCP_VERSION" \> 3.4) -eq 1 ] ; then
89+
retry subscription-manager repos --enable rhel-7-fast-datapath-rpms
90+
fi
91+
8792
# Allow RPM integrity checking
8893
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release

openshift.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ parameters:
99
# This value is used to select the RPM repo for the OCP release to install
1010
ocp_version:
1111
type: string
12-
default: "3.4"
12+
default: "3.5"
1313
description: >
1414
The version of OpenShift Container Platform to deploy
1515

0 commit comments

Comments
 (0)