From febcb600f122dc644f8a05c4a7697a39e9157834 Mon Sep 17 00:00:00 2001 From: Michal Rostecki Date: Wed, 18 Nov 2015 07:22:17 +0100 Subject: 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 --- docker/swift/swift-base/Dockerfile.j2 | 2 +- docker/swift/swift-base/build-swift-ring.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docker/swift') diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index e48bcc7f6..d6afb2b24 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -13,7 +13,7 @@ RUN yum -y install openstack-swift \ ADD swift-base-archive /swift-base-source RUN ln -s swift-base-source/* swift \ && useradd --user-group swift \ - && pip --no-cache-dir install /swift \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install /swift \ && mkdir -p /etc/swift /var/log/swift /home/swift \ && cp -r /swift/etc/* /etc/swift/ \ && chown -R swift: /etc/swift /var/log/swift /home/swift diff --git a/docker/swift/swift-base/build-swift-ring.py b/docker/swift/swift-base/build-swift-ring.py index d7386392d..af20af7e6 100644 --- a/docker/swift/swift-base/build-swift-ring.py +++ b/docker/swift/swift-base/build-swift-ring.py @@ -67,7 +67,7 @@ def run(args): 'and zones are required') sys.exit(1) - run_cmd(['/usr/bin/swift-ring-builder', + run_cmd(['swift-ring-builder', args.ring_file, 'create', args.part_power, @@ -75,13 +75,13 @@ def run(args): args.min_part_hours]) for i in xrange(len(hosts)): - run_cmd(['/usr/bin/swift-ring-builder', + run_cmd(['swift-ring-builder', args.ring_file, 'add', 'z{}-{}/{}'.format(zones[i], hosts[i], devices[i]), weights[i]]) - run_cmd(['/usr/bin/swift-ring-builder', args.ring_file, 'rebalance']) + run_cmd(['swift-ring-builder', args.ring_file, 'rebalance']) def main(): -- cgit v1.2.3