1. devstack
  2. Commit 85879f1f8157a60fc190eb2731e4edd0deb1dae3
Browse code

Use the installed swift scripts

This commit switches how scripts we use to launch the installed version
in the path. Previously the scripts were manually executed in the source
repo, but this has issues if you're trying to run with py3 in a system
where python == py2. Setuptools already does the shebang magic for us
at install time, so we just need to use the installed version of the
script.

Change-Id: Iaa4d80ec607a2aa200400330e16cad3a4ca782ac

Matthew Treinish authored on 2017/01/05 09:51:50
Showing 1 changed files
lib/swift
History View file @ 85879f1
... ... 
@@ -809,10 +809,10 @@ function start_swift {
809 809 
         local proxy_port=${SWIFT_DEFAULT_BIND_PORT}
810 810 
         start_tls_proxy swift '*' $proxy_port $SERVICE_HOST $SWIFT_DEFAULT_BIND_PORT_INT
811 811 
     fi
812 
-    run_process s-proxy "$SWIFT_DIR/bin/swift-proxy-server ${SWIFT_CONF_DIR}/proxy-server.conf -v"
812 
+    run_process s-proxy "swift-proxy-server ${SWIFT_CONF_DIR}/proxy-server.conf -v"
813 813 
     if [[ ${SWIFT_REPLICAS} == 1 ]]; then
814 814 
         for type in object container account; do
815 
-            run_process s-${type} "$SWIFT_DIR/bin/swift-${type}-server ${SWIFT_CONF_DIR}/${type}-server/1.conf -v"
815 
+            run_process s-${type} "swift-${type}-server ${SWIFT_CONF_DIR}/${type}-server/1.conf -v"
816 816 
         done
817 817 
     fi
818 818