josch/devstack_custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #157 from cloudbuilders/swift-config-location

Browse source 
change swift config location to SWIFT_DIR/config
This commit is contained in:
Chmouel Boudjnah 2011-11-03 09:39:54 -07:00
commit a81bbbda93
7 changed files with 53 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
files/swift/account-server.conf
View file

@ -4,6 +4,7 @@ mount_check = false
bind_port = %BIND_PORT% bind_port = %BIND_PORT%
user = %USER% user = %USER%
log_facility = LOG_LOCAL%LOG_FACILITY% log_facility = LOG_LOCAL%LOG_FACILITY%
swift_dir = %SWIFT_CONFIG_LOCATION%
[pipeline:main] [pipeline:main]
pipeline = account-server pipeline = account-server

1
files/swift/container-server.conf
View file

@ -4,6 +4,7 @@ mount_check = false
bind_port = %BIND_PORT% bind_port = %BIND_PORT%
user = %USER% user = %USER%
log_facility = LOG_LOCAL%LOG_FACILITY% log_facility = LOG_LOCAL%LOG_FACILITY%
swift_dir = %SWIFT_CONFIG_LOCATION%
[pipeline:main] [pipeline:main]
pipeline = container-server pipeline = container-server

1
files/swift/object-server.conf
View file

@ -4,6 +4,7 @@ mount_check = false
bind_port = %BIND_PORT% bind_port = %BIND_PORT%
user = %USER% user = %USER%
log_facility = LOG_LOCAL%LOG_FACILITY% log_facility = LOG_LOCAL%LOG_FACILITY%
swift_dir = %SWIFT_CONFIG_LOCATION%
[pipeline:main] [pipeline:main]
pipeline = object-server pipeline = object-server

1
files/swift/proxy-server.conf
View file

@ -2,6 +2,7 @@
bind_port = 8080 bind_port = 8080
user = %USER% user = %USER%
log_facility = LOG_LOCAL1 log_facility = LOG_LOCAL1
swift_dir = %SWIFT_CONFIG_LOCATION%
[pipeline:main] [pipeline:main]
pipeline = healthcheck cache %AUTH_SERVER% proxy-server pipeline = healthcheck cache %AUTH_SERVER% proxy-server

24
files/swift/rsyncd.conf
View file

@ -6,74 +6,74 @@ address = 127.0.0.1
[account6012] [account6012]
max connections = 25 max connections = 25
path = %SWIFT_LOCATION%/1/node/ path = %SWIFT_DATA_LOCATION%/1/node/
read only = false read only = false
lock file = /var/lock/account6012.lock lock file = /var/lock/account6012.lock
[account6022] [account6022]
max connections = 25 max connections = 25
path = %SWIFT_LOCATION%/2/node/ path = %SWIFT_DATA_LOCATION%/2/node/
read only = false read only = false
lock file = /var/lock/account6022.lock lock file = /var/lock/account6022.lock
[account6032] [account6032]
max connections = 25 max connections = 25
path = %SWIFT_LOCATION%/3/node/ path = %SWIFT_DATA_LOCATION%/3/node/
read only = false read only = false
lock file = /var/lock/account6032.lock lock file = /var/lock/account6032.lock
[account6042] [account6042]
max connections = 25 max connections = 25
path = %SWIFT_LOCATION%/4/node/ path = %SWIFT_DATA_LOCATION%/4/node/
read only = false read only = false
lock file = /var/lock/account6042.lock lock file = /var/lock/account6042.lock
[container6011] [container6011]
max connections = 25 max connections = 25
path = %SWIFT_LOCATION%/1/node/ path = %SWIFT_DATA_LOCATION%/1/node/
read only = false read only = false
lock file = /var/lock/container6011.lock lock file = /var/lock/container6011.lock
[container6021] [container6021]
max connections = 25 max connections = 25
path = %SWIFT_LOCATION%/2/node/ path = %SWIFT_DATA_LOCATION%/2/node/
read only = false read only = false
lock file = /var/lock/container6021.lock lock file = /var/lock/container6021.lock
[container6031] [container6031]
max connections = 25 max connections = 25
path = %SWIFT_LOCATION%/3/node/ path = %SWIFT_DATA_LOCATION%/3/node/
read only = false read only = false
lock file = /var/lock/container6031.lock lock file = /var/lock/container6031.lock
[container6041] [container6041]
max connections = 25 max connections = 25
path = %SWIFT_LOCATION%/4/node/ path = %SWIFT_DATA_LOCATION%/4/node/
read only = false read only = false
lock file = /var/lock/container6041.lock lock file = /var/lock/container6041.lock
[object6010] [object6010]
max connections = 25 max connections = 25
path = %SWIFT_LOCATION%/1/node/ path = %SWIFT_DATA_LOCATION%/1/node/
read only = false read only = false
lock file = /var/lock/object6010.lock lock file = /var/lock/object6010.lock
[object6020] [object6020]
max connections = 25 max connections = 25
path = %SWIFT_LOCATION%/2/node/ path = %SWIFT_DATA_LOCATION%/2/node/
read only = false read only = false
lock file = /var/lock/object6020.lock lock file = /var/lock/object6020.lock
[object6030] [object6030]
max connections = 25 max connections = 25
path = %SWIFT_LOCATION%/3/node/ path = %SWIFT_DATA_LOCATION%/3/node/
read only = false read only = false
lock file = /var/lock/object6030.lock lock file = /var/lock/object6030.lock
[object6040] [object6040]
max connections = 25 max connections = 25
path = %SWIFT_LOCATION%/4/node/ path = %SWIFT_DATA_LOCATION%/4/node/
read only = false read only = false
lock file = /var/lock/object6040.lock lock file = /var/lock/object6040.lock

2
files/swift/swift-remakerings
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
cd /etc/swift cd %SWIFT_CONFIG_LOCATION%
rm -f *.builder *.ring.gz backups/*.builder backups/*.ring.gz rm -f *.builder *.ring.gz backups/*.builder backups/*.ring.gz

61
stack.sh
View file

@ -293,9 +293,13 @@ GLANCE_HOSTPORT=${GLANCE_HOSTPORT:-$HOST_IP:9292}
# TODO: add logging to different location. # TODO: add logging to different location.
# By default the location of swift drives and objects is located inside # By default the location of swift drives and objects is located inside
# the swift source directory. SWIFT_LOCATION variable allow you to redefine # the swift source directory. SWIFT_DATA_LOCATION variable allow you to redefine
# this. # this.
SWIFT_LOCATION=${SWIFT_LOCATION:-${SWIFT_DIR}/data} SWIFT_DATA_LOCATION=${SWIFT_DATA_LOCATION:-${SWIFT_DIR}/data}
# We are going to have the configuration files inside the source
# directory, change SWIFT_CONFIG_LOCATION if you want to adjust that.
SWIFT_CONFIG_LOCATION=${SWIFT_CONFIG_LOCATION:-${SWIFT_DIR}/config}
# devstack will create a loop-back disk formatted as XFS to store the # devstack will create a loop-back disk formatted as XFS to store the
# swift data. By default the disk size is 1 gigabyte. The variable # swift data. By default the disk size is 1 gigabyte. The variable
@ -644,47 +648,54 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
# changing the permissions so we can run it as our user. # changing the permissions so we can run it as our user.
USER_GROUP=$(id -g) USER_GROUP=$(id -g)
sudo mkdir -p ${SWIFT_LOCATION}/drives sudo mkdir -p ${SWIFT_DATA_LOCATION}/drives
sudo chown -R $USER:${USER_GROUP} ${SWIFT_LOCATION}/drives sudo chown -R $USER:${USER_GROUP} ${SWIFT_DATA_LOCATION}/drives
# We then create a loopback disk and format it to XFS. # We then create a loopback disk and format it to XFS.
if [[ ! -e ${SWIFT_LOCATION}/drives/images/swift.img ]];then if [[ ! -e ${SWIFT_DATA_LOCATION}/drives/images/swift.img ]];then
mkdir -p ${SWIFT_LOCATION}/drives/images mkdir -p ${SWIFT_DATA_LOCATION}/drives/images
sudo touch ${SWIFT_LOCATION}/drives/images/swift.img sudo touch ${SWIFT_DATA_LOCATION}/drives/images/swift.img
sudo chown $USER: ${SWIFT_LOCATION}/drives/images/swift.img sudo chown $USER: ${SWIFT_DATA_LOCATION}/drives/images/swift.img
dd if=/dev/zero of=${SWIFT_LOCATION}/drives/images/swift.img \ dd if=/dev/zero of=${SWIFT_DATA_LOCATION}/drives/images/swift.img \
bs=1024 count=0 seek=${SWIFT_LOOPBACK_DISK_SIZE} bs=1024 count=0 seek=${SWIFT_LOOPBACK_DISK_SIZE}
mkfs.xfs -f -i size=1024 ${SWIFT_LOCATION}/drives/images/swift.img mkfs.xfs -f -i size=1024 ${SWIFT_DATA_LOCATION}/drives/images/swift.img
fi fi
# After the drive being created we mount the disk with a few mount # After the drive being created we mount the disk with a few mount
# options to make it most efficient as possible for swift. # options to make it most efficient as possible for swift.
mkdir -p ${SWIFT_LOCATION}/drives/sdb1 mkdir -p ${SWIFT_DATA_LOCATION}/drives/sdb1
if ! egrep -q ${SWIFT_LOCATION}/drives/sdb1 /proc/mounts;then if ! egrep -q ${SWIFT_DATA_LOCATION}/drives/sdb1 /proc/mounts;then
sudo mount -t xfs -o loop,noatime,nodiratime,nobarrier,logbufs=8 \ sudo mount -t xfs -o loop,noatime,nodiratime,nobarrier,logbufs=8 \
${SWIFT_LOCATION}/drives/images/swift.img ${SWIFT_LOCATION}/drives/sdb1 ${SWIFT_DATA_LOCATION}/drives/images/swift.img ${SWIFT_DATA_LOCATION}/drives/sdb1
fi fi
# We then create link to that mounted location so swift would know # We then create link to that mounted location so swift would know
# where to go. # where to go.
for x in {1..4}; do sudo ln -sf ${SWIFT_LOCATION}/drives/sdb1/$x ${SWIFT_LOCATION}/$x; done for x in {1..4}; do sudo ln -sf ${SWIFT_DATA_LOCATION}/drives/sdb1/$x ${SWIFT_DATA_LOCATION}/$x; done
# We now have to emulate a few different servers into one we # We now have to emulate a few different servers into one we
# create all the directories needed for swift # create all the directories needed for swift
tmpd="" tmpd=""
for d in ${SWIFT_LOCATION}/drives/sdb1/{1..4} /etc/swift /etc/swift/{object,container,account}-server \ for d in ${SWIFT_DATA_LOCATION}/drives/sdb1/{1..4} \
${SWIFT_LOCATION}/{1..4}/node/sdb1 /var/run/swift ;do ${SWIFT_CONFIG_LOCATION}/{object,container,account}-server \
${SWIFT_DATA_LOCATION}/{1..4}/node/sdb1 /var/run/swift ;do
[[ -d $d ]] && continue [[ -d $d ]] && continue
sudo install -o ${USER} -g $USER_GROUP -d $d sudo install -o ${USER} -g $USER_GROUP -d $d
done done
sudo chown -R $USER: ${SWIFT_LOCATION}/{1..4}/node # We do want to make sure this is all owned by our user.
sudo chown -R $USER: ${SWIFT_DATA_LOCATION}/{1..4}/node
sudo chown -R $USER: ${SWIFT_CONFIG_LOCATION}
# swift-init has a bug using /etc/swift until bug #885595 is fixed
# we have to create a link
sudo ln -s ${SWIFT_CONFIG_LOCATION} /etc/swift
# 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_DATA_LOCATION%,$SWIFT_DATA_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
@ -703,10 +714,10 @@ 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,%SWIFT_CONFIG_LOCATION%,${SWIFT_CONFIG_LOCATION},;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 ${SWIFT_CONFIG_LOCATION}/proxy-server.conf
sed -e "s/%SWIFT_HASH%/$SWIFT_HASH/" $FILES/swift/swift.conf > /etc/swift/swift.conf sed -e "s/%SWIFT_HASH%/$SWIFT_HASH/" $FILES/swift/swift.conf > ${SWIFT_CONFIG_LOCATION}/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
@ -718,9 +729,9 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
local node_number local node_number
for node_number in {1..4};do for node_number in {1..4};do
node_path=${SWIFT_LOCATION}/${node_number} node_path=${SWIFT_DATA_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,%SWIFT_CONFIG_LOCATION%,${SWIFT_CONFIG_LOCATION},;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 > ${SWIFT_CONFIG_LOCATION}/${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
@ -736,7 +747,7 @@ 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/swift-remakerings | \ sed -e "s,%SWIFT_CONFIG_LOCATION%,${SWIFT_CONFIG_LOCATION},;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/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-*