openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove all fail sections for Ubuntu"

Browse Source
This commit is contained in:
Jenkins 2015-09-28 09:42:43 +00:00 committed by Gerrit Code Review
commit 5b482b68c2
18 changed files with 44 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
docker/base/Dockerfile.j2
View File

@ -1,6 +1,29 @@
FROM {{ base_distro }}:{{ base_distro_tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Early failure for bases and types
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
{% if install_type not in ['source', 'binary', 'rdo', 'rhel'] %}
RUN echo 'ERROR: {{ install_type }} is unavailable for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% if install_type not in ['source'] %}
RUN echo 'ERROR: {{ install_type }} is unavailable for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% else %}
RUN echo 'ERROR: The specified distro has no Kolla images to build: "{{ base_distro }}"' \
&& /bin/false
{% endif %}
{{ include_header }}
ENV KOLLA_BASE_DISTRO {{ base_distro }}

9
docker/ceilometer/ceilometer-base/Dockerfile.j2
View File

@ -1,14 +1,7 @@
FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% elif install_type == 'source' %}
{% if install_type == 'source' %}
ADD ceilometer-base-archive /ceilometer-base-source
RUN ln -s ceilometer-base-source/* ceilometer \

5
docker/cinder/cinder-base/Dockerfile.j2
View File

@ -14,11 +14,6 @@ RUN yum -y install openstack-cinder \
# NOTE(sdake): The sed operations make LVM tools work inside a container - see
# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

6
docker/designate/designate-base/Dockerfile.j2
View File

@ -4,7 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net.kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
# Install designate-api because of /etc/designate/policy.json, which
# is needed in all services. This is probably a packaging bug. We do
# need the complete policy file because of some of the containers'
@ -18,11 +17,6 @@ RUN yum install -y \
&& rpm -e openstack-designate-api \
&& mv /tmp/policy.json /etc/designate/
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type}} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% elif install_type == 'source' %}

6
docker/glance/glance-base/Dockerfile.j2
View File

@ -4,7 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
openstack-glance \
python-oslo-i18n \
@ -12,11 +11,6 @@ RUN yum -y install \
python-cryptography \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['ubuntu', 'debian'] %}

5
docker/heat/heat-api-cfn/Dockerfile.j2
View File

@ -7,11 +7,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-heat-api-cfn \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% endif %}

5
docker/heat/heat-api/Dockerfile.j2
View File

@ -7,11 +7,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-heat-api \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% endif %}

8
docker/heat/heat-base/Dockerfile.j2
View File

@ -4,15 +4,9 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
python-oslo-reports \
RUN yum -y install python-oslo-reports \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% elif install_type == 'source' %}

9
docker/heat/heat-engine/Dockerfile.j2
View File

@ -4,19 +4,14 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
# TODO(SamYaple): until packaging is fixed, all of the python clients below are required
# http://pkgs.fedoraproject.org/cgit/openstack-heat.git/tree/openstack-heat.spec#n248
RUN yum -y install \
# until http://pkgs.fedoraproject.org/cgit/openstack-heat.git/tree/openstack-heat.spec#n248 \
# is updated, the clients must remain here: \
python-barbicanclient \
python-zaqarclient \
openstack-heat-engine \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% endif %}

8
docker/horizon/Dockerfile.j2
View File

@ -21,14 +21,6 @@ RUN sed -i "s|WEBROOT = '/dashboard/'|WEBROOT = '/'|" /etc/openstack-dashboard/l
&& /usr/bin/python /usr/bin/manage.py collectstatic --noinput --clear \
&& /usr/bin/python /usr/bin/manage.py compress --force
# djano-pyscss causes manage.py compress to fail as shipped with current
# RDO. Upgrading to latest version appears to get mange.py to work properly
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

9
docker/ironic/ironic-base/Dockerfile.j2
View File

@ -4,19 +4,14 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
# until packaging is fixed, all of this is required
# api: policy
# TODO(SamYaple): until packaging is fixed, all of this is required
# http://pkgs.fedoraproject.org/cgit/openstack-ironic.git/tree/openstack-ironic.spec#n78
RUN yum -y install \
python-oslo-log \
python-oslo-concurrency \
python-oslo-policy \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% elif install_type == 'source' %}

14
docker/keystone/Dockerfile.j2
View File

@ -15,20 +15,6 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/admin \
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \
apache2 \
keystone \
libapache2-mod-wsgi \
python-keystoneclient \
&& apt-get clean
RUN ln -s /etc/apache2/sites-available/wsgi-keystone.conf /etc/apache2/sites-enabled \
&& mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/main \
&& cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/admin
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}

2
docker/magnum/magnum-base/Dockerfile.j2
View File

@ -10,7 +10,7 @@ RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/epel-7
RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/fedora-22/sdake-openstack-magnum-fedora-22.repo -o /etc/yum.repos.d/sdake-openstack-magnum-f22.repo
{% elif base_distro in ['ubuntu', 'debian', 'oraclelinux'] %}
{% elif base_distro in ['oraclelinux'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false

7
docker/murano/murano-base/Dockerfile.j2
View File

@ -1,12 +1,7 @@
FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif install_type == 'source' %}
{% if install_type == 'source' %}
ADD murano-base-archive /murano-base-source
RUN ln -s murano-base-source/* murano \

9
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -4,8 +4,8 @@ MAINTAINER Kolla Project (https://launchpad.net.kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install openstack-neutron \
RUN yum -y install \
openstack-neutron \
openstack-neutron-ml2 \
openvswitch \
&& yum clean all
@ -13,11 +13,6 @@ RUN yum -y install openstack-neutron \
# TODO (sdake): remove once RDO adds to the openstack-neutron package
RUN pip install oslo.versionedobjects
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type}} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['ubuntu', 'debian'] %}

8
docker/nova/nova-base/Dockerfile.j2
View File

@ -12,17 +12,11 @@ RUN yum -y install \
bridge-utils \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
bridge-utils \
RUN yum -y install bridge-utils \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}

9
docker/swift/swift-base/Dockerfile.j2
View File

@ -4,15 +4,10 @@ MAINTAINER Kolla Project (https://launchpad.net.kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install openstack-swift && yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type}} not yet available for {{ base_distro }}' \
&& /bin/false
RUN yum -y install openstack-swift \
&& yum clean all
{% endif %}
{% elif install_type == 'source' %}
ADD swift-base-archive /swift-base-source

9
docker/zaqar/Dockerfile.j2
View File

@ -4,13 +4,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install openstack-zaqar && yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
RUN yum -y install openstack-zaqar \
&& yum clean all
{% endif %}
{% elif install_type == 'source' %}