openstack/devstack
Code Issues Proposed changes

Move all swift files to $FILES/swift/

Browse Source
This commit is contained in:
Chmouel Boudjnah 2011-11-02 19:09:30 +01:00
parent 1298dccb3d
commit 537ddff259
9 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
files/swift-account-server.conf → files/swift/account-server.conf
View File

0
files/swift-container-server.conf → files/swift/container-server.conf
View File

0
files/swift-object-server.conf → files/swift/object-server.conf
View File

0
files/swift-proxy-server.conf → files/swift/proxy-server.conf
View File

0
files/swift-rsyncd.conf → files/swift/rsyncd.conf
View File

0
files/swift-remakerings → files/swift/swift-remakerings Normal file → Executable file
View File

0
files/swift-startmain → files/swift/swift-startmain
View File

0
files/swift.conf → files/swift/swift.conf
View File

12
stack.sh
View File

@ -662,7 +662,7 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]];then
# Swift use rsync to syncronize between all the different # Swift use rsync to syncronize between all the different
# partitions (which make more sense when you have a multi-node # partitions (which make more sense when you have a multi-node
# setup) we configure it with our version of rsync. # setup) we configure it with our version of rsync.
sed -e "s/%GROUP%/${USER_GROUP}/;s/%USER%/$USER/;s,%SWIFT_LOCATION%,$SWIFT_LOCATION," $FILES/swift-rsyncd.conf | sudo tee /etc/rsyncd.conf sed -e "s/%GROUP%/${USER_GROUP}/;s/%USER%/$USER/;s,%SWIFT_LOCATION%,$SWIFT_LOCATION," $FILES/swift/rsyncd.conf | sudo tee /etc/rsyncd.conf
sudo sed -i '/^RSYNC_ENABLE=false/ { s/false/true/ }' /etc/default/rsync sudo sed -i '/^RSYNC_ENABLE=false/ { s/false/true/ }' /etc/default/rsync
# By default Swift will be installed with the tempauth middleware # By default Swift will be installed with the tempauth middleware
@ -682,9 +682,9 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]];then
# We do the install of the proxy-server and swift configuration # We do the install of the proxy-server and swift configuration
# replacing a few directives to match our configuration. # replacing a few directives to match our configuration.
sed "s/%USER%/$USER/;s/%SERVICE_TOKEN%/${SERVICE_TOKEN}/;s/%AUTH_SERVER%/${swift_auth_server}/" \ sed "s/%USER%/$USER/;s/%SERVICE_TOKEN%/${SERVICE_TOKEN}/;s/%AUTH_SERVER%/${swift_auth_server}/" \
$FILES/swift-proxy-server.conf|sudo tee /etc/swift/proxy-server.conf $FILES/swift/proxy-server.conf|sudo tee /etc/swift/proxy-server.conf
sed -e "s/%SWIFT_HASH%/$SWIFT_HASH/" $FILES/swift.conf > /etc/swift/swift.conf sed -e "s/%SWIFT_HASH%/$SWIFT_HASH/" $FILES/swift/swift.conf > /etc/swift/swift.conf
# We need to generate a object/account/proxy configuration # We need to generate a object/account/proxy configuration
# emulating 4 nodes on different ports we have a little function # emulating 4 nodes on different ports we have a little function
@ -698,7 +698,7 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]];then
for node_number in {1..4};do for node_number in {1..4};do
node_path=${SWIFT_LOCATION}/${node_number} node_path=${SWIFT_LOCATION}/${node_number}
sed -e "s,%USER%,$USER,;s,%NODE_PATH%,${node_path},;s,%BIND_PORT%,${bind_port},;s,%LOG_FACILITY%,${log_facility}," \ sed -e "s,%USER%,$USER,;s,%NODE_PATH%,${node_path},;s,%BIND_PORT%,${bind_port},;s,%LOG_FACILITY%,${log_facility}," \
$FILES/swift-${server_type}-server.conf > /etc/swift/${server_type}-server/${node_number}.conf $FILES/swift/${server_type}-server.conf > /etc/swift/${server_type}-server/${node_number}.conf
bind_port=$(( ${bind_port} + 10 )) bind_port=$(( ${bind_port} + 10 ))
log_facility=$(( ${log_facility} + 1 )) log_facility=$(( ${log_facility} + 1 ))
done done
@ -714,9 +714,9 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]];then
# - swift-startmain # - swift-startmain
# Restart your full cluster. # Restart your full cluster.
# #
sed -e "s/%SWIFT_PARTITION_POWER_SIZE%/$SWIFT_PARTITION_POWER_SIZE/" $FILES/swift-remakerings | \ sed -e "s/%SWIFT_PARTITION_POWER_SIZE%/$SWIFT_PARTITION_POWER_SIZE/" $FILES/swift/swift-remakerings | \
sudo tee /usr/local/bin/swift-remakerings sudo tee /usr/local/bin/swift-remakerings
sudo install -m755 $FILES/swift-startmain /usr/local/bin/ sudo install -m755 $FILES/swift/swift-startmain /usr/local/bin/
sudo chmod +x /usr/local/bin/swift-* sudo chmod +x /usr/local/bin/swift-*
# We then can start rsync. # We then can start rsync.