Skip to content

Commit 084f51f

Browse files
author
Dean Troyer
committed
Clean up local variable usage - Swift
Change-Id: Id02ebdfa5cb3f6c763293876c6bb031184ebd663
1 parent d3121f6 commit 084f51f

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
@@ -150,9 +150,10 @@ function cleanup_swift {
150150
function _cleanup_swift_apache_wsgi {
151151
sudo rm -f $SWIFT_APACHE_WSGI_DIR/*.wsgi
152152
disable_apache_site proxy-server
153+
local node_number type
153154
for node_number in ${SWIFT_REPLICAS_SEQ}; do
154155
for type in object container account; do
155-
site_name=${type}-server-${node_number}
156+
local site_name=${type}-server-${node_number}
156157
disable_apache_site ${site_name}
157158
sudo rm -f $(apache_site_config_for ${site_name})
158159
done
@@ -182,10 +183,11 @@ function _config_swift_apache_wsgi {
182183
" -i ${SWIFT_APACHE_WSGI_DIR}/proxy-server.wsgi
183184

184185
# copy apache vhost file and set name and port
186+
local node_number
185187
for node_number in ${SWIFT_REPLICAS_SEQ}; do
186-
object_port=$[OBJECT_PORT_BASE + 10 * ($node_number - 1)]
187-
container_port=$[CONTAINER_PORT_BASE + 10 * ($node_number - 1)]
188-
account_port=$[ACCOUNT_PORT_BASE + 10 * ($node_number - 1)]
188+
local object_port=$[OBJECT_PORT_BASE + 10 * ($node_number - 1)]
189+
local container_port=$[CONTAINER_PORT_BASE + 10 * ($node_number - 1)]
190+
local account_port=$[ACCOUNT_PORT_BASE + 10 * ($node_number - 1)]
189191

190192
sudo cp ${SWIFT_DIR}/examples/apache2/object-server.template $(apache_site_config_for object-server-${node_number})
191193
sudo sed -e "
@@ -245,7 +247,7 @@ function generate_swift_config {
245247
local server_type=$4
246248

247249
log_facility=$[ node_id - 1 ]
248-
node_path=${SWIFT_DATA_DIR}/${node_number}
250+
local node_path=${SWIFT_DATA_DIR}/${node_number}
249251

250252
iniuncomment ${swift_node_config} DEFAULT user
251253
iniset ${swift_node_config} DEFAULT user ${STACK_USER}
@@ -416,8 +418,9 @@ EOF
416418
iniset ${SWIFT_CONF_DIR}/swift.conf swift-hash swift_hash_path_suffix ${SWIFT_HASH}
417419
iniset ${SWIFT_CONF_DIR}/swift.conf swift-constraints max_header_size ${SWIFT_MAX_HEADER_SIZE}
418420

421+
local node_number
419422
for node_number in ${SWIFT_REPLICAS_SEQ}; do
420-
swift_node_config=${SWIFT_CONF_DIR}/object-server/${node_number}.conf
423+
local swift_node_config=${SWIFT_CONF_DIR}/object-server/${node_number}.conf
421424
cp ${SWIFT_DIR}/etc/object-server.conf-sample ${swift_node_config}
422425
generate_swift_config ${swift_node_config} ${node_number} $[OBJECT_PORT_BASE + 10 * (node_number - 1)] object
423426
iniset ${swift_node_config} filter:recon recon_cache_path ${SWIFT_DATA_DIR}/cache
@@ -460,7 +463,7 @@ EOF
460463
iniset ${testfile} func_test auth_prefix /v2.0/
461464
fi
462465

463-
swift_log_dir=${SWIFT_DATA_DIR}/logs
466+
local swift_log_dir=${SWIFT_DATA_DIR}/logs
464467
rm -rf ${swift_log_dir}
465468
mkdir -p ${swift_log_dir}/hourly
466469
sudo chown -R ${STACK_USER}:adm ${swift_log_dir}
@@ -484,9 +487,9 @@ function create_swift_disk {
484487
# First do a bit of setup by creating the directories and
485488
# changing the permissions so we can run it as our user.
486489

487-
USER_GROUP=$(id -g ${STACK_USER})
490+
local user_group=$(id -g ${STACK_USER})
488491
sudo mkdir -p ${SWIFT_DATA_DIR}/{drives,cache,run,logs}
489-
sudo chown -R ${STACK_USER}:${USER_GROUP} ${SWIFT_DATA_DIR}
492+
sudo chown -R ${STACK_USER}:${user_group} ${SWIFT_DATA_DIR}
490493

491494
# Create a loopback disk and format it to XFS.
492495
if [[ -e ${SWIFT_DISK_IMAGE} ]]; then
@@ -514,15 +517,16 @@ function create_swift_disk {
514517

515518
# Create a link to the above mount and
516519
# create all of the directories needed to emulate a few different servers
520+
local node_number
517521
for node_number in ${SWIFT_REPLICAS_SEQ}; do
518522
sudo ln -sf ${SWIFT_DATA_DIR}/drives/sdb1/$node_number ${SWIFT_DATA_DIR}/$node_number;
519-
drive=${SWIFT_DATA_DIR}/drives/sdb1/${node_number}
520-
node=${SWIFT_DATA_DIR}/${node_number}/node
521-
node_device=${node}/sdb1
523+
local drive=${SWIFT_DATA_DIR}/drives/sdb1/${node_number}
524+
local node=${SWIFT_DATA_DIR}/${node_number}/node
525+
local node_device=${node}/sdb1
522526
[[ -d $node ]] && continue
523527
[[ -d $drive ]] && continue
524-
sudo install -o ${STACK_USER} -g $USER_GROUP -d $drive
525-
sudo install -o ${STACK_USER} -g $USER_GROUP -d $node_device
528+
sudo install -o ${STACK_USER} -g $user_group -d $drive
529+
sudo install -o ${STACK_USER} -g $user_group -d $node_device
526530
sudo chown -R ${STACK_USER}: ${node}
527531
done
528532
}
@@ -540,49 +544,49 @@ function create_swift_disk {
540544

541545
function create_swift_accounts {
542546
# Defines specific passwords used by tools/create_userrc.sh
543-
SWIFTUSERTEST1_PASSWORD=testing
544-
SWIFTUSERTEST2_PASSWORD=testing2
545-
SWIFTUSERTEST3_PASSWORD=testing3
547+
local swiftusertest1_password=testing
548+
local swiftusertest2_password=testing2
549+
local swiftusertest3_password=testing3
546550

547551
KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql}
548552

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

552-
SWIFT_USER=$(get_or_create_user "swift" \
553-
"$SERVICE_PASSWORD" $SERVICE_TENANT)
554-
get_or_add_user_role $ADMIN_ROLE $SWIFT_USER $SERVICE_TENANT
556+
local swift_user=$(get_or_create_user "swift" \
557+
"$SERVICE_PASSWORD" $service_tenant)
558+
get_or_add_user_role $admin_role $swift_user $service_tenant
555559

556560
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
557561

558-
SWIFT_SERVICE=$(get_or_create_service "swift" \
562+
local swift_service=$(get_or_create_service "swift" \
559563
"object-store" "Swift Service")
560-
get_or_create_endpoint $SWIFT_SERVICE \
564+
get_or_create_endpoint $swift_service \
561565
"$REGION_NAME" \
562566
"http://$SERVICE_HOST:8080/v1/AUTH_\$(tenant_id)s" \
563567
"http://$SERVICE_HOST:8080" \
564568
"http://$SERVICE_HOST:8080/v1/AUTH_\$(tenant_id)s"
565569
fi
566570

567-
SWIFT_TENANT_TEST1=$(get_or_create_project swifttenanttest1)
568-
die_if_not_set $LINENO SWIFT_TENANT_TEST1 "Failure creating SWIFT_TENANT_TEST1"
569-
SWIFT_USER_TEST1=$(get_or_create_user swiftusertest1 $SWIFTUSERTEST1_PASSWORD \
570-
"$SWIFT_TENANT_TEST1" "test@example.com")
571+
local 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")
571575
die_if_not_set $LINENO SWIFT_USER_TEST1 "Failure creating SWIFT_USER_TEST1"
572-
get_or_add_user_role $ADMIN_ROLE $SWIFT_USER_TEST1 $SWIFT_TENANT_TEST1
576+
get_or_add_user_role $admin_role $SWIFT_USER_TEST1 $swift_tenant_test1
573577

574-
SWIFT_USER_TEST3=$(get_or_create_user swiftusertest3 $SWIFTUSERTEST3_PASSWORD \
575-
"$SWIFT_TENANT_TEST1" "test3@example.com")
576-
die_if_not_set $LINENO SWIFT_USER_TEST3 "Failure creating SWIFT_USER_TEST3"
577-
get_or_add_user_role $ANOTHER_ROLE $SWIFT_USER_TEST3 $SWIFT_TENANT_TEST1
578+
local 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
578582

579-
SWIFT_TENANT_TEST2=$(get_or_create_project swifttenanttest2)
580-
die_if_not_set $LINENO SWIFT_TENANT_TEST2 "Failure creating SWIFT_TENANT_TEST2"
583+
local swift_tenant_test2=$(get_or_create_project swifttenanttest2)
584+
die_if_not_set $LINENO swift_tenant_test2 "Failure creating swift_tenant_test2"
581585

582-
SWIFT_USER_TEST2=$(get_or_create_user swiftusertest2 $SWIFTUSERTEST2_PASSWORD \
583-
"$SWIFT_TENANT_TEST2" "test2@example.com")
584-
die_if_not_set $LINENO SWIFT_USER_TEST2 "Failure creating SWIFT_USER_TEST2"
585-
get_or_add_user_role $ADMIN_ROLE $SWIFT_USER_TEST2 $SWIFT_TENANT_TEST2
586+
local 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
586590
}
587591

588592
# init_swift() - Initialize rings
@@ -666,6 +670,7 @@ function start_swift {
666670
# service so we can run it in foreground in screen. ``swift-init ...
667671
# {stop|restart}`` exits with '1' if no servers are running, ignore it just
668672
# in case
673+
local todo type
669674
swift-init --run-dir=${SWIFT_DATA_DIR}/run all restart || true
670675
if [[ ${SWIFT_REPLICAS} == 1 ]]; then
671676
todo="object container account"
@@ -683,6 +688,7 @@ function start_swift {
683688

684689
# stop_swift() - Stop running processes (non-screen)
685690
function stop_swift {
691+
local type
686692

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

0 commit comments

Comments
 (0)