openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix RHEL builds"

Browse Source
This commit is contained in:
Jenkins 2015-11-05 09:42:34 +00:00 committed by Gerrit Code Review
commit 0ee4b57e44
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/base/Dockerfile.j2
View File

@ -58,8 +58,8 @@ RUN curl http://trunk.rdoproject.org/centos7/delorean-deps.repo -o /etc/yum.repo
{% if install_metatype == 'rhos' %}
# Turn on the RHOS 7.0 repo for RHOS
RUN subscription-manager repos --enable rhel-7-server-rpms \
&& subscription-manager repos --enable rhel-7-server-openstack-7.0-rpms
RUN yum-config-manager --enable rhel-7-server-rpms \
&& yum-config-manager --enable rhel-7-server-openstack-7.0-rpms
{% endif %}
@ -82,8 +82,8 @@ RUN rpm -e --nodeps systemd-container systemd-container-libs \
RUN yum install -y \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
&& yum clean all \
&& subscription-manager repos --enable rhel-7-server-optional-rpms \
&& subscription-manager repos --enable rhel-7-server-extras-rpms
&& yum-config-manager --enable rhel-7-server-optional-rpms \
&& yum-config-manager --enable rhel-7-server-extras-rpms
{% endif %}
# Endif for base_distro RHEL

2
kolla/cmd/build.py
View File

@ -326,6 +326,8 @@ class KollaWorker(object):
self.install_metatype = 'rdo'
elif self.install_type == 'source':
self.install_metatype = 'mixed'
elif self.install_type == 'rhel':
self.install_metatype = 'rhos'
self.tag = config['tag']
self.include_header = config['include_header']