Customizations for Glance
This patchset contains customization of Dockerfile of Glance containers Also removed mkdir /etc/ceph as obsolete. Change-Id: I3ba6e0d2dca1ecf72cf9f1b00e05e6955611c361 Partially-implements: blueprint third-party-plugin-support
This commit is contained in:
parent
8f90e62b48
commit
8306864e28
@ -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
|
||||||
|
@ -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 }}
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user