openstack
/
kolla
Code Issues Proposed changes

Merge "Port stable/mitaka to use RDO for binary" into stable/mitaka

This commit is contained in:
Jenkins 2016-04-13 06:35:04 +00:00 committed by Gerrit Code Review
parent a494219c46 ec8fa1ea1e
commit 1fc872deca
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/base/Dockerfile.j2
View File

@ -27,8 +27,6 @@ COPY kibana.yum.repo /etc/yum.repos.d/kibana.yum.repo
# Turns on MariaDB repos throughout the RPM build
COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo
COPY ceph.yum.repo /etc/yum.repos.d/ceph.repo
RUN yum -y install http://repo.percona.com/release/7/RPMS/x86_64/percona-release-0.1-3.noarch.rpm
RUN rpm --import http://yum.mariadb.org/RPM-GPG-KEY-MariaDB \
@ -56,7 +54,10 @@ RUN yum-config-manager --enable rhel-7-server-rpms \
{% if base_distro == 'centos' %}
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 \
&& yum install -y epel-release yum-plugin-priorities \
&& yum install -y \
epel-release \
centos-release-openstack-mitaka \
yum-plugin-priorities \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
&& yum clean all
@ -80,6 +81,7 @@ RUN yum install -y \
{% if base_distro == 'oraclelinux' %}
COPY ceph.yum.repo /etc/yum.repos.d/ceph.repo
COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo
RUN yum install -y \
tar \

26
docker/base/versionlock.list
View File

@ -1,13 +1,13 @@
1:ceph-0.94.5-0.el7.centos.*
1:ceph-common-0.94.5-0.el7.centos.*
1:ceph-debuginfo-0.94.5-0.el7.centos.*
1:ceph-devel-compat-0.94.5-0.el7.centos.*
1:ceph-libs-compat-0.94.5-0.el7.centos.*
1:ceph-radosgw-0.94.5-0.el7.centos.*
1:libcephfs1-0.94.5-0.el7.centos.*
1:librados2-0.94.5-0.el7.centos.*
1:librbd1-0.94.5-0.el7.centos.*
1:mesos-0.27.1
1:python-cephfs-0.94.5-0.el7.centos.*
1:python-rados-0.94.5-0.el7.centos.*
1:python-rbd-0.94.5-0.el7.centos.*
1:ceph-0.94.5-1.el7.*
1:ceph-common-0.94.5-1.el7.*
1:ceph-debuginfo-0.94.5-0.el7.*
1:ceph-devel-compat-0.94.5-1.el7.*
1:ceph-libs-compat-0.94.5-1.el7.*
1:ceph-radosgw-0.94.5-1.el7.*
1:librados2-0.94.5-1.el7.*
1:libcephfs1-0.94.5-1.el7.*
1:librbd1-0.94.5-1.el7.*
1:mesos-0.27.1*
1:python-cephfs-0.94.5-1.el7.*
1:python-rados-0.94.5-1.el7.*
1:python-rbd-0.94.5-1.el7.*

2
docker/kolla-toolbox/Dockerfile.j2
View File

@ -15,7 +15,7 @@ RUN yum -y install \
python-devel \
openssh-clients \
&& yum clean all \
&& rpm -e --nodeps pytz
&& rpm -e --nodeps pytz python-babel
{% elif base_distro in ['ubuntu', 'debian'] %}

2
kolla/common/config.py
View File

@ -139,7 +139,7 @@ _BASE_OPTS = [
cfg.StrOpt('maintainer', deprecated_group='kolla-build',
default='Kolla Project (https://launchpad.net/kolla)',
help='The MAINTAINER field'),
cfg.ListOpt('rpm_setup_config', default=[DELOREAN, DELOREAN_DEPS],
cfg.ListOpt('rpm_setup_config', default='',
deprecated_group='kolla-build',
help=('Comma separated list of .rpm or .repo file(s) '
'or URL(s) to install before building containers')),