Skip to content

Commit 28fa4e8

Browse files
chmouelchmouel
committed
Add swift support.
Based on github.sh/cloudbuilders/deploy.sh/swift. This is a WIP branch.
1 parent e708064 commit 28fa4e8

File tree

9 files changed

+271
-1
lines changed

9 files changed

+271
-1
lines changed

‎files/apts/swift‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
curl
2+
gcc
3+
memcached
4+
memcached
5+
python-configobj
6+
python-coverage
7+
python-dev
8+
python-eventlet
9+
python-greenlet
10+
python-netifaces
11+
python-nose
12+
python-nose
13+
python-pastedeploy
14+
python-setuptools
15+
python-simplejson
16+
python-webob
17+
python-xattr
18+
sqlite3
19+
xfsprogs

‎files/swift-account-server.conf‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[DEFAULT]
2+
devices = %NODE_PATH%/node
3+
mount_check = false
4+
bind_port = %BIND_PORT%
5+
user = stack
6+
log_facility = LOG_LOCAL%LOG_FACILITY%
7+
8+
[pipeline:main]
9+
pipeline = account-server
10+
11+
[app:account-server]
12+
use = egg:swift#account
13+
14+
[account-replicator]
15+
vm_test_mode = yes
16+
17+
[account-auditor]
18+
19+
[account-reaper]

‎files/swift-container-server.conf‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[DEFAULT]
2+
devices = %NODE_PATH%/node
3+
mount_check = false
4+
bind_port = %BIND_PORT%
5+
user = stack
6+
log_facility = LOG_LOCAL%LOG_FACILITY%
7+
8+
[pipeline:main]
9+
pipeline = container-server
10+
11+
[app:container-server]
12+
use = egg:swift#container
13+
14+
[container-replicator]
15+
vm_test_mode = yes
16+
17+
[container-updater]
18+
19+
[container-auditor]
20+
21+
[container-sync]

‎files/swift-object-server.conf‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[DEFAULT]
2+
devices = %NODE_PATH%/node
3+
mount_check = false
4+
bind_port = %BIND_PORT%
5+
user = stack
6+
log_facility = LOG_LOCAL%LOG_FACILITY%
7+
8+
[pipeline:main]
9+
pipeline = object-server
10+
11+
[app:object-server]
12+
use = egg:swift#object
13+
14+
[object-replicator]
15+
vm_test_mode = yes
16+
17+
[object-updater]
18+
19+
[object-auditor]

‎files/swift-proxy-server.conf‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
[DEFAULT]
2+
bind_port = 8080
3+
user = stack
4+
log_facility = LOG_LOCAL1
5+
6+
[pipeline:main]
7+
pipeline = healthcheck cache tempauth proxy-server
8+
9+
[app:proxy-server]
10+
use = egg:swift#proxy
11+
allow_account_management = true
12+
13+
[filter:tempauth]
14+
use = egg:swift#tempauth
15+
user_admin_admin = admin .admin .reseller_admin
16+
user_test_tester = testing .admin
17+
user_test2_tester2 = testing2 .admin
18+
user_test_tester3 = testing3
19+
bind_ip = ${MY_IP}
20+
21+
[filter:healthcheck]
22+
use = egg:swift#healthcheck
23+
24+
[filter:cache]
25+
use = egg:swift#memcache

‎files/swift-rsyncd.conf‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
uid = stack
2+
gid = stack
3+
log file = /var/log/rsyncd.log
4+
pid file = /var/run/rsyncd.pid
5+
address = 127.0.0.1
6+
7+
[account6012]
8+
max connections = 25
9+
path = %SWIFT_LOOPBACK_DISK_SIZE%/1/node/
10+
read only = false
11+
lock file = /var/lock/account6012.lock
12+
13+
[account6022]
14+
max connections = 25
15+
path = %SWIFT_LOOPBACK_DISK_SIZE%/2/node/
16+
read only = false
17+
lock file = /var/lock/account6022.lock
18+
19+
[account6032]
20+
max connections = 25
21+
path = %SWIFT_LOOPBACK_DISK_SIZE%/3/node/
22+
read only = false
23+
lock file = /var/lock/account6032.lock
24+
25+
[account6042]
26+
max connections = 25
27+
path = %SWIFT_LOOPBACK_DISK_SIZE%/4/node/
28+
read only = false
29+
lock file = /var/lock/account6042.lock
30+
31+
32+
[container6011]
33+
max connections = 25
34+
path = %SWIFT_LOOPBACK_DISK_SIZE%/1/node/
35+
read only = false
36+
lock file = /var/lock/container6011.lock
37+
38+
[container6021]
39+
max connections = 25
40+
path = %SWIFT_LOOPBACK_DISK_SIZE%/2/node/
41+
read only = false
42+
lock file = /var/lock/container6021.lock
43+
44+
[container6031]
45+
max connections = 25
46+
path = %SWIFT_LOOPBACK_DISK_SIZE%/3/node/
47+
read only = false
48+
lock file = /var/lock/container6031.lock
49+
50+
[container6041]
51+
max connections = 25
52+
path = %SWIFT_LOOPBACK_DISK_SIZE%/4/node/
53+
read only = false
54+
lock file = /var/lock/container6041.lock
55+
56+
57+
[object6010]
58+
max connections = 25
59+
path = %SWIFT_LOOPBACK_DISK_SIZE%/1/node/
60+
read only = false
61+
lock file = /var/lock/object6010.lock
62+
63+
[object6020]
64+
max connections = 25
65+
path = %SWIFT_LOOPBACK_DISK_SIZE%/2/node/
66+
read only = false
67+
lock file = /var/lock/object6020.lock
68+
69+
[object6030]
70+
max connections = 25
71+
path = %SWIFT_LOOPBACK_DISK_SIZE%/3/node/
72+
read only = false
73+
lock file = /var/lock/object6030.lock
74+
75+
[object6040]
76+
max connections = 25
77+
path = %SWIFT_LOOPBACK_DISK_SIZE%/4/node/
78+
read only = false
79+
lock file = /var/lock/object6040.lock

‎files/swift.conf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[swift-hash]
2+
# random unique string that can never change (DO NOT LOSE)
3+
swift_hash_path_suffix = %SWIFT_HASH%

‎stack.sh‎

Lines changed: 82 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,10 @@ KEYSTONE_DIR=$DEST/keystone
150150
NOVACLIENT_DIR=$DEST/python-novaclient
151151
OPENSTACKX_DIR=$DEST/openstackx
152152
NOVNC_DIR=$DEST/noVNC
153+
SWIFT_DIR=$DEST/swift
153154

154155
# Specify which services to launch. These generally correspond to screen tabs
155-
ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,horizon,mysql,rabbit}
156+
ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,horizon,mysql,rabbit,swift}
156157

157158
# Nova hypervisor configuration. We default to libvirt whth **kvm** but will
158159
# drop back to **qemu** if we are unable to load the kvm module. Stack.sh can
@@ -270,6 +271,14 @@ read_password RABBIT_PASSWORD "ENTER A PASSWORD TO USE FOR RABBIT."
270271
# Glance connection info. Note the port must be specified.
271272
GLANCE_HOSTPORT=${GLANCE_HOSTPORT:-$HOST_IP:9292}
272273

274+
# SWIFT
275+
# -----
276+
#
277+
# Location of SWIFT drives
278+
SWIFT_DRIVE_LOCATION=${SWIFT_DRIVE_LOCATION:-/srv}
279+
280+
# Size of the loopback disks
281+
SWIFT_LOOPBACK_DISK_SIZE=${SWIFT_LOOPBACK_DISK_SIZE:-1000000}
273282

274283
# Keystone
275284
# --------
@@ -349,6 +358,8 @@ function git_clone {
349358

350359
# compute service
351360
git_clone $NOVA_REPO $NOVA_DIR $NOVA_BRANCH
361+
# storage service
362+
git_clone $SWIFT_REPO $SWIFT_DIR $SWIFT_BRANCH
352363
# image catalog service
353364
git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH
354365
# unified auth system (manages accounts/tokens)
@@ -370,6 +381,7 @@ git_clone $OPENSTACKX_REPO $OPENSTACKX_DIR $OPENSTACKX_BRANCH
370381
# setup our checkouts so they are installed into python path
371382
# allowing ``import nova`` or ``import glance.client``
372383
cd $KEYSTONE_DIR; sudo python setup.py develop
384+
cd $SWIFT_DIR; sudo python setup.py develop
373385
cd $GLANCE_DIR; sudo python setup.py develop
374386
cd $NOVACLIENT_DIR; sudo python setup.py develop
375387
cd $NOVA_DIR; sudo python setup.py develop
@@ -580,6 +592,75 @@ if [[ "$ENABLED_SERVICES" =~ "n-net" ]]; then
580592
mkdir -p $NOVA_DIR/networks
581593
fi
582594

595+
# Storage Service
596+
if [[ "$ENABLED_SERVICES" =~ "swift" ]];then
597+
mkdir -p ${SWIFT_DRIVE_LOCATION}/drives
598+
local s=${SWIFT_DRIVE_LOCATION}/drives/sdb1 # Shortcut variable
599+
600+
# Create a loopback disk and format it with XFS.
601+
if [[ ! -e ${SWIFT_DRIVE_LOCATION}/swift-disk ]];then
602+
dd if=/dev/zero of=${SWIFT_DRIVE_LOCATION}/swift-disk bs=1024 count=0 seek=${SWIFT_LOOPBACK_DISK_SIZE}
603+
mkfs.xfs -f -i size=1024 ${SWIFT_DRIVE_LOCATION}/swift-disk
604+
fi
605+
606+
# Add the mountpoint to fstab
607+
if ! egrep -q "^${SWIFT_DRIVE_LOCATION}/swift-disk" /etc/fstab;then
608+
echo "# Added by devstack" | tee -a /etc/fstab
609+
echo "${SWIFT_DRIVE_LOCATION}/swift-disk ${s} xfs loop,noatime,nodiratime,nobarrier,logbufs=8 0 0" | \
610+
tee -a /etc/fstab
611+
fi
612+
613+
# Create and mount drives.
614+
mkdir -p ${s}
615+
mount ${s}
616+
mkdir ${s}/{1..4}
617+
618+
# Create directories
619+
install -g stack -o stack -d /etc/swift/{object,container,account}-server \
620+
${SWIFT_DRIVE_LOCATION}/{1..4}/node/sdb1 /var/run/swift
621+
622+
# Adjust rc.local to always have a /var/run/swift on reboot
623+
# created and chown to our user.
624+
# TODO (chmou): We may not have a "exit 0"
625+
sed -i '/^exit 0/d' /etc/rc.local
626+
cat <<EOF>>/etc/rc.local
627+
mkdir -p /var/run/swift
628+
chown stack: /var/run/swift
629+
exit 0
630+
EOF
631+
632+
# Add rsync file
633+
sed -e "s/%SWIFT_LOOPBACK_DISK_SIZE%/$SWIFT_DRIVE_LOCATION/" $FILES/swift-rsyncd.conf > /etc/rsyncd.conf
634+
635+
# Copy proxy-server configuration
636+
cp $FILES/swift-proxy-server.conf /etc/swift/
637+
638+
# Generate swift.conf, we need to have the swift-hash being random
639+
# and unique.
640+
local SWIFT_HASH=$(od -t x8 -N 8 -A n </dev/random)
641+
sed -e "s/%SWIFT_HASH%/$SWIFT_HASH/" $FILES/swift.conf > /etc/swift/swift.conf
642+
643+
# We need to generate a object/account/proxy configuration
644+
# emulating 4 nodes on different ports we have a litle function
645+
# that help us doing that.
646+
function generate_swift_configuration() {
647+
local server_type=$1
648+
local bind_port=$2
649+
local log_facility=$3
650+
for node_number in {1..4};do
651+
node_path=${SWIFT_DRIVE_LOCATION}/${node_number}/node
652+
sed -e "s/%NODE_PATH%/${node_path}/;s/%BIND_PORT%/${bind_port}/;s/%LOG_FACILITY%/${log_facility}/" \
653+
$FILES/swift-${server_type}-server.conf > /etc/swift/${server_type}-server/${node_number}.conf
654+
bind_port=$(( ${bind_port} + 10 ))
655+
log_facility=$(( ${log_facility} + 1 ))
656+
done
657+
}
658+
generate_swift_configuration object 6010 2
659+
generate_swift_configuration container 6011 2
660+
generate_swift_configuration account 6012 2
661+
662+
fi
663+
583664
# Volume Service
584665
# --------------
585666

‎stackrc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
NOVA_REPO=https://github.com/cloudbuilders/nova.git
33
NOVA_BRANCH=diablo
44

5+
# storage service
6+
SWIFT_REPO=https://github.com/openstack/swift.git
7+
SWIFT_BRANCH=diablo
8+
59
# image catalog service
610
GLANCE_REPO=https://github.com/cloudbuilders/glance.git
711
GLANCE_BRANCH=diablo

0 commit comments

Comments
 (0)