openstack/kolla-ansible
Code Issues Proposed changes

Fix RHEL builds

Browse Source 
Register with RHEL on the host machine and use yum to setup
the repos in the container.

Change-Id: I38aaf43fffaf7a235e69b330d5d9f0f1be31fe83
Backport: Liberty
Closes-Bug: #1513088
This commit is contained in:
Ryan Hallisey 2015-11-03 23:30:35 -05:00
parent c2d2d7ec12
commit 0340bc4043
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' %} {% if install_metatype == 'rhos' %}
# Turn on the RHOS 7.0 repo for RHOS # Turn on the RHOS 7.0 repo for RHOS
RUN subscription-manager repos --enable rhel-7-server-rpms \ RUN yum-config-manager --enable rhel-7-server-rpms \
&& subscription-manager repos --enable rhel-7-server-openstack-7.0-rpms && yum-config-manager --enable rhel-7-server-openstack-7.0-rpms
{% endif %} {% endif %}
@ -82,8 +82,8 @@ RUN rpm -e --nodeps systemd-container systemd-container-libs \
RUN yum install -y \ RUN yum install -y \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
&& yum clean all \ && yum clean all \
&& subscription-manager repos --enable rhel-7-server-optional-rpms \ && yum-config-manager --enable rhel-7-server-optional-rpms \
&& subscription-manager repos --enable rhel-7-server-extras-rpms && yum-config-manager --enable rhel-7-server-extras-rpms
{% endif %} {% endif %}
# Endif for base_distro RHEL # Endif for base_distro RHEL

2
kolla/cmd/build.py
View File

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