Fix broken centos-source- build: add rdo repository
openvswitch requires rdo repository to be installed Change-Id: I173bb3d32bcef2b890ab482083b0ffb830c3b7fb Closes-Bug: #1495470
This commit is contained in:
parent
172103749e
commit
aec595f7f7
@ -153,6 +153,14 @@ RUN yum install -y \
|
||||
# Endif for install_type binary
|
||||
{% elif install_type == 'source' %}
|
||||
|
||||
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
||||
|
||||
# Set up repositories
|
||||
RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \
|
||||
&& yum clean all
|
||||
|
||||
{% endif %}
|
||||
|
||||
# Update packages
|
||||
RUN yum update -y \
|
||||
&& yum install -y \
|
||||
|
@ -3,7 +3,9 @@ MAINTAINER Kolla Project (https://launchpad.net.kolla)
|
||||
|
||||
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
||||
|
||||
RUN yum install -y supervisor \
|
||||
RUN yum install -y \
|
||||
openvswitch \
|
||||
supervisor \
|
||||
&& yum clean all
|
||||
|
||||
COPY supervisord.conf /etc/
|
||||
|
@ -20,11 +20,7 @@ RUN echo '{{ install_type}} not yet available for {{ base_distro }}' \
|
||||
|
||||
{% endif %}
|
||||
{% elif install_type == 'source' %}
|
||||
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
||||
|
||||
RUN yum -y install openvswitch
|
||||
|
||||
{% elif base_distro in ['ubuntu', 'debian'] %}
|
||||
{% if base_distro in ['ubuntu', 'debian'] %}
|
||||
|
||||
RUN apt-get install -y --no-install-recommends \
|
||||
iptables \
|
||||
|
@ -16,8 +16,6 @@ RUN yum install -y \
|
||||
|
||||
# Install required packages
|
||||
RUN yum install -y \
|
||||
#TODO: will be addressed later
|
||||
https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \
|
||||
openvswitch \
|
||||
&& yum clean all
|
||||
|
||||
|
@ -2,13 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
|
||||
MAINTAINER Kolla Project (https://launchpad.net/kolla)
|
||||
|
||||
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
||||
{% if install_type == 'source' %}
|
||||
|
||||
# TODO(sdake): groan openvswitch is only in the RDO repos
|
||||
RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \
|
||||
&& yum clean all
|
||||
|
||||
{% endif %}
|
||||
|
||||
RUN yum install -y \
|
||||
openvswitch \
|
||||
|
Loading…
Reference in New Issue
Block a user