Browse code

Fix devstack to support the new pulled out swift3

Change-Id: Ia4f5092e666b581aab4af4851c2848e84817c07a

Joe Gordon authored on 2012/05/25 06:11:01
Showing 3 changed files
... ...
@@ -40,7 +40,7 @@ admin_user = %SERVICE_USERNAME%
40 40
 admin_password = %SERVICE_PASSWORD%
41 41
 
42 42
 [filter:swift3]
43
-use = egg:swift#swift3
43
+use = egg:swift3#middleware
44 44
 
45 45
 [filter:tempauth]
46 46
 use = egg:swift#tempauth
... ...
@@ -214,6 +214,7 @@ KEYSTONECLIENT_DIR=$DEST/python-keystoneclient
214 214
 OPENSTACKCLIENT_DIR=$DEST/python-openstackclient
215 215
 NOVNC_DIR=$DEST/noVNC
216 216
 SWIFT_DIR=$DEST/swift
217
+SWIFT3_DIR=$DEST/swift3
217 218
 QUANTUM_DIR=$DEST/quantum
218 219
 QUANTUM_CLIENT_DIR=$DEST/python-quantumclient
219 220
 MELANGE_DIR=$DEST/melange
... ...
@@ -673,6 +674,7 @@ fi
673 673
 if is_service_enabled swift; then
674 674
     # storage service
675 675
     git_clone $SWIFT_REPO $SWIFT_DIR $SWIFT_BRANCH
676
+    git_clone $SWIFT3_REPO $SWIFT3_DIR $SWIFT3_BRANCH
676 677
 fi
677 678
 if is_service_enabled g-api n-api; then
678 679
     # image catalog service
... ...
@@ -716,6 +718,7 @@ if is_service_enabled key g-api n-api swift; then
716 716
 fi
717 717
 if is_service_enabled swift; then
718 718
     cd $SWIFT_DIR; sudo python setup.py develop
719
+    cd $SWIFT3_DIR; sudo python setup.py develop
719 720
 fi
720 721
 if is_service_enabled g-api n-api; then
721 722
     cd $GLANCE_DIR; sudo python setup.py develop
... ...
@@ -16,6 +16,9 @@ NOVA_BRANCH=master
16 16
 # storage service
17 17
 SWIFT_REPO=https://github.com/openstack/swift.git
18 18
 SWIFT_BRANCH=master
19
+SWIFT3_REPO=https://github.com/fujita/swift3.git
20
+SWIFT3_BRANCH=master
21
+
19 22
 
20 23
 # image catalog service
21 24
 GLANCE_REPO=https://github.com/openstack/glance.git