Skip to content

Commit 3a2837a

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Clean up local variable usage - Swift"
2 parents f9ae6ae + 084f51f commit 3a2837a

1 file changed

Lines changed: 45 additions & 39 deletions

File tree

‎lib/swift‎

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,10 @@ function cleanup_swift {
154154
function _cleanup_swift_apache_wsgi {
155155
sudo rm -f $SWIFT_APACHE_WSGI_DIR/*.wsgi
156156
disable_apache_site proxy-server
157+
local node_number type
157158
for node_number in ${SWIFT_REPLICAS_SEQ}; do
158159
for type in object container account; do
159-
site_name=${type}-server-${node_number}
160+
local site_name=${type}-server-${node_number}
160161
disable_apache_site ${site_name}
161162
sudo rm -f $(apache_site_config_for ${site_name})
162163
done
@@ -186,10 +187,11 @@ function _config_swift_apache_wsgi {
186187
" -i ${SWIFT_APACHE_WSGI_DIR}/proxy-server.wsgi
187188

188189
# copy apache vhost file and set name and port
190+
local node_number
189191
for node_number in ${SWIFT_REPLICAS_SEQ}; do
190-
object_port=$[OBJECT_PORT_BASE + 10 * ($node_number - 1)]
191-
container_port=$[CONTAINER_PORT_BASE + 10 * ($node_number - 1)]
192-
account_port=$[ACCOUNT_PORT_BASE + 10 * ($node_number - 1)]
192+
local object_port=$[OBJECT_PORT_BASE + 10 * ($node_number - 1)]
193+
local container_port=$[CONTAINER_PORT_BASE + 10 * ($node_number - 1)]
194+
local account_port=$[ACCOUNT_PORT_BASE + 10 * ($node_number - 1)]
193195

194196
sudo cp ${SWIFT_DIR}/examples/apache2/object-server.template $(apache_site_config_for object-server-${node_number})
195197
sudo sed -e "
@@ -249,7 +251,7 @@ function generate_swift_config {
249251
local server_type=$4
250252

251253
log_facility=$[ node_id - 1 ]
252-
node_path=${SWIFT_DATA_DIR}/${node_number}
254+
local node_path=${SWIFT_DATA_DIR}/${node_number}
253255

254256
iniuncomment ${swift_node_config} DEFAULT user
255257
iniset ${swift_node_config} DEFAULT user ${STACK_USER}
@@ -420,8 +422,9 @@ EOF
420422
iniset ${SWIFT_CONF_DIR}/swift.conf swift-hash swift_hash_path_suffix ${SWIFT_HASH}
421423
iniset ${SWIFT_CONF_DIR}/swift.conf swift-constraints max_header_size ${SWIFT_MAX_HEADER_SIZE}
422424

425+
local node_number
423426
for node_number in ${SWIFT_REPLICAS_SEQ}; do
424-
swift_node_config=${SWIFT_CONF_DIR}/object-server/${node_number}.conf
427+
local swift_node_config=${SWIFT_CONF_DIR}/object-server/${node_number}.conf
425428
cp ${SWIFT_DIR}/etc/object-server.conf-sample ${swift_node_config}
426429
generate_swift_config ${swift_node_config} ${node_number} $[OBJECT_PORT_BASE + 10 * (node_number - 1)] object
427430
iniset ${swift_node_config} filter:recon recon_cache_path ${SWIFT_DATA_DIR}/cache
@@ -464,7 +467,7 @@ EOF
464467
iniset ${testfile} func_test auth_prefix /v2.0/
465468
fi
466469

467-
swift_log_dir=${SWIFT_DATA_DIR}/logs
470+
local swift_log_dir=${SWIFT_DATA_DIR}/logs
468471
rm -rf ${swift_log_dir}
469472
mkdir -p ${swift_log_dir}/hourly
470473
sudo chown -R ${STACK_USER}:adm ${swift_log_dir}
@@ -488,9 +491,9 @@ function create_swift_disk {
488491
# First do a bit of setup by creating the directories and
489492
# changing the permissions so we can run it as our user.
490493

491-
USER_GROUP=$(id -g ${STACK_USER})
494+
local user_group=$(id -g ${STACK_USER})
492495
sudo mkdir -p ${SWIFT_DATA_DIR}/{drives,cache,run,logs}
493-
sudo chown -R ${STACK_USER}:${USER_GROUP} ${SWIFT_DATA_DIR}
496+
sudo chown -R ${STACK_USER}:${user_group} ${SWIFT_DATA_DIR}
494497

495498
# Create a loopback disk and format it to XFS.
496499
if [[ -e ${SWIFT_DISK_IMAGE} ]]; then
@@ -518,15 +521,16 @@ function create_swift_disk {
518521

519522
# Create a link to the above mount and
520523
# create all of the directories needed to emulate a few different servers
524+
local node_number
521525
for node_number in ${SWIFT_REPLICAS_SEQ}; do
522526
sudo ln -sf ${SWIFT_DATA_DIR}/drives/sdb1/$node_number ${SWIFT_DATA_DIR}/$node_number;
523-
drive=${SWIFT_DATA_DIR}/drives/sdb1/${node_number}
524-
node=${SWIFT_DATA_DIR}/${node_number}/node
525-
node_device=${node}/sdb1
527+
local drive=${SWIFT_DATA_DIR}/drives/sdb1/${node_number}
528+
local node=${SWIFT_DATA_DIR}/${node_number}/node
529+
local node_device=${node}/sdb1
526530
[[ -d $node ]] && continue
527531
[[ -d $drive ]] && continue
528-
sudo install -o ${STACK_USER} -g $USER_GROUP -d $drive
529-
sudo install -o ${STACK_USER} -g $USER_GROUP -d $node_device
532+
sudo install -o ${STACK_USER} -g $user_group -d $drive
533+
sudo install -o ${STACK_USER} -g $user_group -d $node_device
530534
sudo chown -R ${STACK_USER}: ${node}
531535
done
532536
}
@@ -544,49 +548,49 @@ function create_swift_disk {
544548

545549
function create_swift_accounts {
546550
# Defines specific passwords used by tools/create_userrc.sh
547-
SWIFTUSERTEST1_PASSWORD=testing
548-
SWIFTUSERTEST2_PASSWORD=testing2
549-
SWIFTUSERTEST3_PASSWORD=testing3
551+
local swiftusertest1_password=testing
552+
local swiftusertest2_password=testing2
553+
local swiftusertest3_password=testing3
550554

551555
KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql}
552556

553-
SERVICE_TENANT=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }")
554-
ADMIN_ROLE=$(openstack role list | awk "/ admin / { print \$2 }")
557+
local service_tenant=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }")
558+
local admin_role=$(openstack role list | awk "/ admin / { print \$2 }")
555559

556-
SWIFT_USER=$(get_or_create_user "swift" \
557-
"$SERVICE_PASSWORD" $SERVICE_TENANT)
558-
get_or_add_user_role $ADMIN_ROLE $SWIFT_USER $SERVICE_TENANT
560+
local swift_user=$(get_or_create_user "swift" \
561+
"$SERVICE_PASSWORD" $service_tenant)
562+
get_or_add_user_role $admin_role $swift_user $service_tenant
559563

560564
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
561565

562-
SWIFT_SERVICE=$(get_or_create_service "swift" \
566+
local swift_service=$(get_or_create_service "swift" \
563567
"object-store" "Swift Service")
564-
get_or_create_endpoint $SWIFT_SERVICE \
568+
get_or_create_endpoint $swift_service \
565569
"$REGION_NAME" \
566570
"http://$SERVICE_HOST:8080/v1/AUTH_\$(tenant_id)s" \
567571
"http://$SERVICE_HOST:8080" \
568572
"http://$SERVICE_HOST:8080/v1/AUTH_\$(tenant_id)s"
569573
fi
570574

571-
SWIFT_TENANT_TEST1=$(get_or_create_project swifttenanttest1)
572-
die_if_not_set $LINENO SWIFT_TENANT_TEST1 "Failure creating SWIFT_TENANT_TEST1"
573-
SWIFT_USER_TEST1=$(get_or_create_user swiftusertest1 $SWIFTUSERTEST1_PASSWORD \
574-
"$SWIFT_TENANT_TEST1" "test@example.com")
575+
local swift_tenant_test1=$(get_or_create_project swifttenanttest1)
576+
die_if_not_set $LINENO swift_tenant_test1 "Failure creating swift_tenant_test1"
577+
SWIFT_USER_TEST1=$(get_or_create_user swiftusertest1 $swiftusertest1_password \
578+
"$swift_tenant_test1" "test@example.com")
575579
die_if_not_set $LINENO SWIFT_USER_TEST1 "Failure creating SWIFT_USER_TEST1"
576-
get_or_add_user_role $ADMIN_ROLE $SWIFT_USER_TEST1 $SWIFT_TENANT_TEST1
580+
get_or_add_user_role $admin_role $SWIFT_USER_TEST1 $swift_tenant_test1
577581

578-
SWIFT_USER_TEST3=$(get_or_create_user swiftusertest3 $SWIFTUSERTEST3_PASSWORD \
579-
"$SWIFT_TENANT_TEST1" "test3@example.com")
580-
die_if_not_set $LINENO SWIFT_USER_TEST3 "Failure creating SWIFT_USER_TEST3"
581-
get_or_add_user_role $ANOTHER_ROLE $SWIFT_USER_TEST3 $SWIFT_TENANT_TEST1
582+
local swift_user_test3=$(get_or_create_user swiftusertest3 $swiftusertest3_password \
583+
"$swift_tenant_test1" "test3@example.com")
584+
die_if_not_set $LINENO swift_user_test3 "Failure creating swift_user_test3"
585+
get_or_add_user_role $ANOTHER_ROLE $swift_user_test3 $swift_tenant_test1
582586

583-
SWIFT_TENANT_TEST2=$(get_or_create_project swifttenanttest2)
584-
die_if_not_set $LINENO SWIFT_TENANT_TEST2 "Failure creating SWIFT_TENANT_TEST2"
587+
local swift_tenant_test2=$(get_or_create_project swifttenanttest2)
588+
die_if_not_set $LINENO swift_tenant_test2 "Failure creating swift_tenant_test2"
585589

586-
SWIFT_USER_TEST2=$(get_or_create_user swiftusertest2 $SWIFTUSERTEST2_PASSWORD \
587-
"$SWIFT_TENANT_TEST2" "test2@example.com")
588-
die_if_not_set $LINENO SWIFT_USER_TEST2 "Failure creating SWIFT_USER_TEST2"
589-
get_or_add_user_role $ADMIN_ROLE $SWIFT_USER_TEST2 $SWIFT_TENANT_TEST2
590+
local swift_user_test2=$(get_or_create_user swiftusertest2 $swiftusertest2_password \
591+
"$swift_tenant_test2" "test2@example.com")
592+
die_if_not_set $LINENO swift_user_test2 "Failure creating swift_user_test2"
593+
get_or_add_user_role $admin_role $swift_user_test2 $swift_tenant_test2
590594
}
591595

592596
# init_swift() - Initialize rings
@@ -670,6 +674,7 @@ function start_swift {
670674
# service so we can run it in foreground in screen. ``swift-init ...
671675
# {stop|restart}`` exits with '1' if no servers are running, ignore it just
672676
# in case
677+
local todo type
673678
swift-init --run-dir=${SWIFT_DATA_DIR}/run all restart || true
674679
if [[ ${SWIFT_REPLICAS} == 1 ]]; then
675680
todo="object container account"
@@ -691,6 +696,7 @@ function start_swift {
691696

692697
# stop_swift() - Stop running processes (non-screen)
693698
function stop_swift {
699+
local type
694700

695701
if [ "$SWIFT_USE_MOD_WSGI" == "True" ]; then
696702
swift-init --run-dir=${SWIFT_DATA_DIR}/run rest stop && return 0

0 commit comments

Comments
 (0)