Skip plugins install for keystone binary builds
There should be no pip install in binary builds, move the installation of the downloaded bits where it belongs into the 'source' install_type section. Change-Id: I6d8609d072d18e635250df1c1e9aa687ce1f769d
This commit is contained in:
parent
f3ff6fb2f2
commit
93ed43818b
|
@ -5,21 +5,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
|
|
||||||
{% import "macros.j2" as macros with context %}
|
{% import "macros.j2" as macros with context %}
|
||||||
|
|
||||||
{% if install_type == 'source' %}
|
|
||||||
ADD plugins-archive /
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
|
COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
|
||||||
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
||||||
|
RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap
|
||||||
|
|
||||||
|
{% if install_type == 'source' %}
|
||||||
|
ADD plugins-archive /
|
||||||
|
|
||||||
{% set keystone_plugins_pip_packages = [
|
{% set keystone_plugins_pip_packages = [
|
||||||
'/plugins/*'
|
'/plugins/*'
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap \
|
RUN if [ "$(ls /plugins)" ]; then \
|
||||||
&& if [ "$(ls /plugins)" ]; then \
|
{{ macros.install_pip(keystone_plugins_pip_packages | customizable("pip_packages")) }}; \
|
||||||
{{ macros.install_pip(keystone_plugins_pip_packages | customizable("pip_packages")) }}; \
|
fi
|
||||||
fi
|
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% block keystone_footer %}{% endblock %}
|
{% block keystone_footer %}{% endblock %}
|
||||||
{% block footer %}{% endblock %}
|
{% block footer %}{% endblock %}
|
||||||
|
|
Loading…
Reference in New Issue