aboutsummaryrefslogtreecommitdiff
path: root/docker/neutron
diff options
context:
space:
mode:
authorChao Guo <guochao@winhong.com>2017-01-17 16:49:13 +0800
committerMauricio Lima <mauriciolimab@gmail.com>2017-02-17 08:49:32 -0300
commit961224c6cf5ac24fc49fc52ab3c51a87348ee35d (patch)
tree23301c12bfd158395e089b7563f0c7058cd2fb6e /docker/neutron
parentdab3b8e8b95cd09f7cc0f99e853cc84b0e1f2638 (diff)
downloadkolla-961224c6cf5ac24fc49fc52ab3c51a87348ee35d.tar.gz
kolla-961224c6cf5ac24fc49fc52ab3c51a87348ee35d.zip
Use install-pip macro in most source images
1. Enable customization of pip packages in source branch of most images 2. All pip packages install uniformly through install-pip macro, user can easily customize his own pip command (For example using a mirror) Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com> Change-Id: If09582039f690fa4136e8f33200d5da15e092da7
Diffstat (limited to 'docker/neutron')
-rw-r--r--docker/neutron/neutron-base/Dockerfile.j213
-rw-r--r--docker/neutron/neutron-lbaas-agent/Dockerfile.j27
-rw-r--r--docker/neutron/neutron-server/Dockerfile.j27
-rw-r--r--docker/neutron/neutron-sfc-agent/Dockerfile.j29
-rw-r--r--docker/neutron/neutron-vpnaas-agent/Dockerfile.j27
5 files changed, 37 insertions, 6 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index d6ec683ea..9b31eceef 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -82,8 +82,17 @@ RUN mkdir -p /usr/share/neutron \
ADD neutron-base-archive /neutron-base-source
ADD plugins-archive /
+
+{% set neutron_base_pip_packages = [
+ '/neutron'
+] %}
+
+{% set neutron_base_plugins_pip_packages = [
+ '/plugins/*'
+] %}
+
RUN ln -s neutron-base-source/* neutron \
- && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron \
+ && {{ macros.install_pip(neutron_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/neutron /usr/share/neutron \
&& cp -r /neutron/etc/* /etc/neutron/ \
&& cp -r /neutron/etc/neutron/* /etc/neutron/ \
@@ -92,7 +101,7 @@ RUN ln -s neutron-base-source/* neutron \
&& chown -R neutron: /etc/neutron /usr/share/neutron \
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/neutron/rootwrap.conf \
&& if [ "$(ls /plugins)" ]; then \
- pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /plugins/*; \
+ {{ macros.install_pip(neutron_base_plugins_pip_packages) }}; \
fi
{% endif %}
diff --git a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
index b84b498e7..79694dc49 100644
--- a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
@@ -33,8 +33,13 @@ MAINTAINER {{ maintainer }}
{% elif install_type == 'source' %}
ADD neutron-lbaas-agent-archive /neutron-lbaas-agent-source
+
+{% set neutron_lbaas_agent_pip_packages = [
+ '/neutron_lbaas'
+] %}
+
RUN ln -s neutron-lbaas-agent-source/* neutron_lbaas \
- && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron_lbaas \
+ && {{ macros.install_pip(neutron_lbaas_agent_pip_packages | customizable("pip_packages")) }} \
&& cp /neutron_lbaas/etc/neutron/rootwrap.d/* /etc/neutron/rootwrap.d \
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/neutron/rootwrap.conf
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index dd6d03bf3..05b65f7a8 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-server/Dockerfile.j2
@@ -27,10 +27,15 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(neutron_server_packages | customizable("packages")) }}
ADD plugins-archive /
+
+{% set neutron_server_plugins_pip_packages = [
+ '/plugins/*'
+] %}
+
COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start
RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start \
&& if [ "$(ls /plugins)" ]; then \
- pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /plugins/*; \
+ {{ macros.install_pip(neutron_server_plugins_pip_packages | customizable("pip_packages")) }}; \
fi
{% block neutron_server_footer %}{% endblock %}
diff --git a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-sfc-agent/Dockerfile.j2
index cdd0b555c..9e1cb1602 100644
--- a/docker/neutron/neutron-sfc-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-sfc-agent/Dockerfile.j2
@@ -3,6 +3,8 @@ MAINTAINER {{ maintainer }}
{% block neutron_networking_sfc_agent_header %}{% endblock %}
+{% import "macros.j2" as macros with context %}
+
{% if install_type == 'binary' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
@@ -11,8 +13,13 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %}
ADD neutron-sfc-agent-archive /neutron-sfc-agent-source
+
+{% set neutron_sfc_agent_pip_packages = [
+ '/neutron-sfc-agent'
+] %}
+
RUN ln -s neutron-sfc-agent-source/* neutron-sfc-agent \
- && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron-sfc-agent
+ && {{ macros.install_pip(neutron_sfc_agent_pip_packages | customizable("pip_packages")) }}
{% endif %}
diff --git a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
index c995cee0e..fadfa2ca0 100644
--- a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
@@ -35,8 +35,13 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(neutron_vpnaas_agent_packages | customizable("packages")) }}
ADD neutron-vpnaas-agent-archive /neutron-vpnaas-agent-source
+
+{% set neutron_vpnaas_agent_pip_packages = [
+ '/neutron_vpnaas'
+] %}
+
RUN ln -s neutron-vpnaas-agent-source/* neutron_vpnaas \
- && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron_vpnaas \
+ && {{ macros.install_pip(neutron_vpnaas_agent_pip_packages | customizable("pip_packages")) }} \
&& cp /neutron_vpnaas/etc/neutron/rootwrap.d/* /etc/neutron/rootwrap.d
{% endif %}