Move CentOS overrides to override folder
Change-Id: Iaabf248211568e333396a8602fe3b9e63681cdea Depends-On: Ica5e05a13ddc3dc9a7f14abcb3ed792ab1b5d27c
This commit is contained in:
parent
5a601c9490
commit
8e76c384ab
|
@ -7,14 +7,7 @@ ARG OVERRIDE=override
|
|||
|
||||
ADD $OVERRIDE /
|
||||
|
||||
ENV OPENSTACK_VERSION=newton
|
||||
|
||||
RUN set -x \
|
||||
# NOTE(Pete Birley): CentOS-OpenStack repo is only used for liberasurecode-devel
|
||||
&& curl -sSL https://raw.githubusercontent.com/rdo-infra/centos-release-openstack/${OPENSTACK_VERSION}-rdo/CentOS-OpenStack.repo > /etc/yum.repos.d/CentOS-OpenStack.repo \
|
||||
&& sed -i "s/OPENSTACK_VERSION/${OPENSTACK_VERSION}/g" /etc/yum.repos.d/CentOS-OpenStack.repo \
|
||||
&& sed -i "/\[centos-openstack-${OPENSTACK_VERSION}\]/s/.*/&\nincludepkgs=liberasurecode*/" /etc/yum.repos.d/CentOS-OpenStack.repo \
|
||||
&& curl -sSL https://raw.githubusercontent.com/rdo-infra/centos-release-openstack/newton-rdo/RPM-GPG-KEY-CentOS-SIG-Cloud > /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud \
|
||||
# NOTE(Pete Birley): libffi-devel does not like being uninstalled on CentOS so we install it seperatly, all of its dependencies are already installed in the docker base image.
|
||||
&& yum install --setopt=tsflags=nodocs -y \
|
||||
libffi-devel \
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v2.0.22 (GNU/Linux)
|
||||
|
||||
mQENBFVWcCcBCACfm3eQ0526/I0/p7HpR0NjK7K307XHhnbcbZv1sDUjQABDaqh0
|
||||
N4gnZcovf+3fj6pcdOmeOpGI0cKE7Fh68RbEIqyjB7l7+j1grjewR0oCFFZ38KGm
|
||||
j+DWQrj1IJW7JU5fH/G0Cu66ix+dJPcuTB3PJTqXN3ce+4TuG09D+epgwfbHlqaT
|
||||
pH2qHCu2uiGj/AaRSM/ZZzcInMaeleHSB+NChvaQ0W/m+kK5d/20d7sfkaTfI/pY
|
||||
SrodCfVTYxfKAd0TLW03kimHs5/Rdz+iZWecVKv6aFxzaywbrOjmOsy2q0kEWIwX
|
||||
MTZrq6cBRRuWyiXsI2zT2YHQ4UK44IxINiaJABEBAAG0WkNlbnRPUyBDbG91ZCBT
|
||||
SUcgKGh0dHA6Ly93aWtpLmNlbnRvcy5vcmcvU3BlY2lhbEludGVyZXN0R3JvdXAv
|
||||
Q2xvdWQpIDxzZWN1cml0eUBjZW50b3Mub3JnPokBOQQTAQIAIwUCVVZwJwIbAwcL
|
||||
CQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEPm5/ud2RCnmATUH/3HDtWxpFkmy
|
||||
FiA3VGkMt5dp3bgCRSd84X6Orfx1LARowpI4LomCGglGBGXVJePBacwcclorbLaz
|
||||
uWrW/wU0efz0aDB5c4NPg/yXfNvujvlda8ADJwZXVBQphzvaIKwl4PqBsEnxC10I
|
||||
93T/0iyphAhfMRJ5R8AbEHMj7uF+TWTX/JoyQagllMqWTwoP4DFRutPdOmmjwvSV
|
||||
kWItH7hq6z9+M4dhlqeoOvPbL5oCxX7TVmLck02Q5gI4syULOa7sqntzUQKFkhWp
|
||||
9U0+5KrBQBKezrurrrkq/WZR3WNE1KQfNQ77f7S2JcXJdOaKgJ7xe7Y2flPq98Aq
|
||||
wKXK7l1c3dc=
|
||||
=W6yF
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
|
@ -0,0 +1,12 @@
|
|||
# NOTE(SamYaple): It appears the version of liberasurecode available in the
|
||||
# repo is ever updating. liberasurecode-1.4.0-1.el7.x86_64.rpm which was built
|
||||
# 2017-02-22 just appeared in the Kilo repo as well as the L, M, N, and O
|
||||
# repos. This might be a problem and is something to watch.
|
||||
# TODO(SamYaple): Find out more info on this subject
|
||||
[centos-openstack-ocata]
|
||||
includepkgs=liberasurecode*
|
||||
name=CentOS-7 - OpenStack Ocata
|
||||
baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-ocata/
|
||||
gpgcheck=1
|
||||
enabled=1
|
||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
|
Loading…
Reference in New Issue