aboutsummaryrefslogtreecommitdiff
path: root/docker/swift
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-27 19:27:42 +0000
committerGerrit Code Review <review@openstack.org>2015-11-27 19:27:42 +0000
commit61550cefac7c6cdc035b8f5f7becdab85035d957 (patch)
treebd21a573a71691fbf264eb4419297a84218ee8e5 /docker/swift
parentf294b5ce2918779e130c76a54252b21f8d32f6e7 (diff)
parentfebcb600f122dc644f8a05c4a7697a39e9157834 (diff)
downloadkolla-61550cefac7c6cdc035b8f5f7becdab85035d957.tar.gz
kolla-61550cefac7c6cdc035b8f5f7becdab85035d957.zip
Merge "Source installation in virtualenv"
Diffstat (limited to 'docker/swift')
-rw-r--r--docker/swift/swift-base/Dockerfile.j22
-rw-r--r--docker/swift/swift-base/build-swift-ring.py6
2 files changed, 4 insertions, 4 deletions
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():