openstack/kolla-ansible
Code Issues Proposed changes

Merge "Customizations for Glance"

Browse Source
This commit is contained in:
Jenkins 2016-08-12 15:46:09 +00:00 committed by Gerrit Code Review
commit e764041f69
3 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/glance/glance-api/Dockerfile.j2
View File

@ -4,6 +4,8 @@ MAINTAINER {{ maintainer }}
COPY extend_start.sh /usr/local/bin/kolla_glance_extend_start COPY extend_start.sh /usr/local/bin/kolla_glance_extend_start
RUN chmod 755 /usr/local/bin/kolla_glance_extend_start RUN chmod 755 /usr/local/bin/kolla_glance_extend_start
{% block glance_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER glance USER glance

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

@ -1,44 +1,32 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set glance_base_packages = [
RUN yum -y install \ 'openstack-glance',
openstack-glance \ 'python-rbd',
python-rbd \ 'python-rados'
python-rados \ ] %}
&& yum clean all \
&& mkdir -p /etc/ceph/
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set glance_base_packages = [
RUN apt-get -y install --no-install-recommends \ 'glance',
glance \ 'python-rbd',
python-rbd \ 'python-rados'
python-rados \ ] %}
&& apt-get clean \
&& mkdir -p /etc/ceph/
{% endif %} {% endif %}
RUN {{ macros.install_packages(glance_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% set glance_base_packages = [
'python-rbd',
'python-rados'
] %}
RUN yum -y install \ RUN {{ macros.install_packages(glance_base_packages | customizable("packages")) }}
python-rbd \
python-rados \
&& yum clean all \
&& mkdir -p /etc/ceph/
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get -y install --no-install-recommends \
python-rbd \
python-rados \
&& apt-get clean \
&& mkdir -p /etc/ceph/
{% endif %}
ADD glance-base-archive /glance-base-source ADD glance-base-archive /glance-base-source
RUN ln -s glance-base-source/* glance \ RUN ln -s glance-base-source/* glance \
@ -58,3 +46,7 @@ RUN usermod -a -G kolla glance \
&& chmod 440 /etc/sudoers.d/kolla_glance_sudoers \ && chmod 440 /etc/sudoers.d/kolla_glance_sudoers \
&& touch /usr/local/bin/kolla_glance_extend_start \ && touch /usr/local/bin/kolla_glance_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_glance_extend_start && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_glance_extend_start
{% block glance_base_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }}

2
docker/glance/glance-registry/Dockerfile.j2
View File

@ -1,6 +1,8 @@
FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% block glance_registry_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER glance USER glance