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

Don't use 'stack' in static but use $USER.

Browse source
This commit is contained in:
Chmouel Boudjnah 2011-11-02 01:10:38 +01:00
parent a55b09d9e8
commit 88d54996db
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@
devices = %NODE_PATH%/node devices = %NODE_PATH%/node
mount_check = false mount_check = false
bind_port = %BIND_PORT% bind_port = %BIND_PORT%
user = stack user = %USER%
log_facility = LOG_LOCAL%LOG_FACILITY% log_facility = LOG_LOCAL%LOG_FACILITY%
[pipeline:main] [pipeline:main]

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

@ -2,7 +2,7 @@
devices = %NODE_PATH%/node devices = %NODE_PATH%/node
mount_check = false mount_check = false
bind_port = %BIND_PORT% bind_port = %BIND_PORT%
user = stack user = %USER%
log_facility = LOG_LOCAL%LOG_FACILITY% log_facility = LOG_LOCAL%LOG_FACILITY%
[pipeline:main] [pipeline:main]

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

@ -2,7 +2,7 @@
devices = %NODE_PATH%/node devices = %NODE_PATH%/node
mount_check = false mount_check = false
bind_port = %BIND_PORT% bind_port = %BIND_PORT%
user = stack user = %USER%
log_facility = LOG_LOCAL%LOG_FACILITY% log_facility = LOG_LOCAL%LOG_FACILITY%
[pipeline:main] [pipeline:main]

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

@ -1,6 +1,6 @@
[DEFAULT] [DEFAULT]
bind_port = 8080 bind_port = 8080
user = stack user = %USER%
log_facility = LOG_LOCAL1 log_facility = LOG_LOCAL1
[pipeline:main] [pipeline:main]

4
stack.sh
View file

@ -655,7 +655,7 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]];then
swift_auth_server=tempauth swift_auth_server=tempauth
fi fi
sed "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
# Generate swift.conf, we need to have the swift-hash being random # Generate swift.conf, we need to have the swift-hash being random
@ -673,7 +673,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,%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 ))