From 60f6fe9d311b9518fb02ac234f4eda78f61a438f Mon Sep 17 00:00:00 2001 From: trown Date: Wed, 8 May 2019 14:24:48 -0400 Subject: [PATCH] openstack: use static .repo file for openstack client --- images/openstack/Dockerfile.ci | 5 ++--- images/openstack/rdo-stein.repo | 7 +++++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 images/openstack/rdo-stein.repo diff --git a/images/openstack/Dockerfile.ci b/images/openstack/Dockerfile.ci index 4c287b3a69e..2c7ee743939 100644 --- a/images/openstack/Dockerfile.ci +++ b/images/openstack/Dockerfile.ci @@ -1,6 +1,5 @@ # This Dockerfile is used by CI to test using OpenShift Installer against an OpenStack cloud. # It builds an image containing the openshift-install command as well as the openstack cli. - FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder WORKDIR /go/src/github.com/openshift/installer COPY . . @@ -8,11 +7,11 @@ RUN hack/build.sh FROM registry.svc.ci.openshift.org/origin/4.1:base COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install +COPY --from=builder /go/src/github.com/openshfit/installer/images/openstack/rdo-stein.repo /etc/yum.repos.d/rdo-stein.repo COPY --from=registry.svc.ci.openshift.org/openshift/origin-v4.0:cli /usr/bin/oc /bin/oc RUN yum install --setopt=tsflags=nodocs -y \ - https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ - https://www.rdoproject.org/repos/rdo-release.rpm && \ + https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm &&\ yum update -y && \ yum install --setopt=tsflags=nodocs -y \ python-openstackclient && \ diff --git a/images/openstack/rdo-stein.repo b/images/openstack/rdo-stein.repo new file mode 100644 index 00000000000..4edae13f062 --- /dev/null +++ b/images/openstack/rdo-stein.repo @@ -0,0 +1,7 @@ +[openstack-stein] +name=OpenStack Stein Repository +baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-stein/ +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=cloud-openstack-stein +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud