Skip to content

openstack: use static .repo file for openstack client #1733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
May 9, 2019
Merged

openstack: use static .repo file for openstack client #1733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions images/openstack/Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
# 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 . .
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 images/openstack/rdo-stein.repo /etc/yum.repos.d/rdo-stein.repo
Copy link
Contributor

@abhinavdahiya abhinavdahiya May 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, shouldn't we use abs path for this?

Copy link
Author

@trown trown May 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we unblock our CI and I will put a follow up to fix this?

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 && \
Expand Down
6 changes: 6 additions & 0 deletions images/openstack/rdo-stein.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[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=0
Copy link
Member

@mandre mandre May 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be better to keep gpgcheck enabled? The https://www.rdoproject.org/repos/rdo-release.rpm rpm provides the public key for CentOS-SIG-Cloud, we could inject it into the image the same way you do for the repo file.

Copy link
Author

@trown trown May 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, I was scrambling to get a patch up quickly yesterday. I didnt think of putting the CentOS-SIG-Cloud public key in a static file like the .repo file.

enabled=1