diff options
| author | Michal Rostecki <mrostecki@mirantis.com> | 2015-11-18 07:22:17 +0100 |
|---|---|---|
| committer | Michal Rostecki <mrostecki@mirantis.com> | 2015-11-27 10:22:17 +0100 |
| commit | febcb600f122dc644f8a05c4a7697a39e9157834 (patch) | |
| tree | e7cdc8485f7613dc8c52a85d0a252c7c24a9d03e /docker/neutron | |
| parent | 563b56126991cfc2f3378f803e071ad79aca3487 (diff) | |
| download | kolla-febcb600f122dc644f8a05c4a7697a39e9157834.tar.gz kolla-febcb600f122dc644f8a05c4a7697a39e9157834.zip | |
Source installation in virtualenv
Use virtualenv for installation of OpenStack projects and
dependencies to avoid conflicts with Python libraries installed
by non-OpenStack binary packages.
Change-Id: I21ecd673b2e93335b1d3dd4e279e940c9d694c3c
Implements: blueprint virtualenv
Diffstat (limited to 'docker/neutron')
4 files changed, 4 insertions, 4 deletions
diff --git a/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh b/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh index 474b6a0b4..47c2ee160 100755 --- a/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh +++ b/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh @@ -5,7 +5,7 @@ set -o errexit source /var/lib/kolla/config-sudoers.sh # Will be removed when neutron-agents is a thin container -CMD="/usr/bin/neutron-dhcp-agent" +CMD="neutron-dhcp-agent" ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini" exec $CMD $ARGS diff --git a/docker/neutron/neutron-agents/neutron-l3-agent/start.sh b/docker/neutron/neutron-agents/neutron-l3-agent/start.sh index 0ba99d1fd..da1b1cc57 100755 --- a/docker/neutron/neutron-agents/neutron-l3-agent/start.sh +++ b/docker/neutron/neutron-agents/neutron-l3-agent/start.sh @@ -5,7 +5,7 @@ set -o errexit source /var/lib/kolla/config-sudoers.sh # Will be removed when this container is broken out into thin containers -CMD="/usr/bin/neutron-l3-agent" +CMD="neutron-l3-agent" ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini" exec $CMD $ARGS diff --git a/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh b/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh index 8a0b5e938..9464a5196 100755 --- a/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh +++ b/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh @@ -5,7 +5,7 @@ set -o errexit source /var/lib/kolla/config-sudoers.sh # Will be removed when this container is broken out in thin containers -CMD="/usr/bin/neutron-metadata-agent" +CMD="neutron-metadata-agent" ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini" exec $CMD $ARGS diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index d0c02728a..a13d3114d 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -39,7 +39,7 @@ RUN apt-get install -y --no-install-recommends \ ADD neutron-base-archive /neutron-base-source RUN ln -s neutron-base-source/* neutron \ && useradd --user-group neutron \ - && pip --no-cache-dir install /neutron \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install /neutron \ && mkdir -p /etc/neutron /usr/share/neutron /var/log/neutron /home/neutron \ && cp -r /neutron/etc/* /etc/neutron/ \ && cp -r /neutron/etc/neutron/* /etc/neutron/ \ |