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

a-space-after-then/do compliance.

Browse source
This commit is contained in:
Chmouel Boudjnah 2011-11-14 15:26:13 +01:00
parent 0277d5b91f
commit f990ded567
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
stack.sh
View file

@ -377,38 +377,38 @@ function get_packages() {
for service in ${ENABLED_SERVICES//,/ }; do for service in ${ENABLED_SERVICES//,/ }; do
if [[ $service == n-* ]]; then if [[ $service == n-* ]]; then
if [[ ! $file_to_parse =~ nova ]];then if [[ ! $file_to_parse =~ nova ]]; then
file_to_parse="${file_to_parse} nova" file_to_parse="${file_to_parse} nova"
fi fi
elif [[ $service == g-* ]];then elif [[ $service == g-* ]]; then
if [[ ! $file_to_parse =~ glance ]];then if [[ ! $file_to_parse =~ glance ]]; then
file_to_parse="${file_to_parse} glance" file_to_parse="${file_to_parse} glance"
fi fi
elif [[ $service == key* ]];then elif [[ $service == key* ]]; then
if [[ ! $file_to_parse =~ keystone ]];then if [[ ! $file_to_parse =~ keystone ]]; then
file_to_parse="${file_to_parse} keystone" file_to_parse="${file_to_parse} keystone"
fi fi
elif [[ -e $FILES/apts/${service} ]];then elif [[ -e $FILES/apts/${service} ]]; then
file_to_parse="${file_to_parse} $service" file_to_parse="${file_to_parse} $service"
fi fi
done done
for file in ${file_to_parse};do for file in ${file_to_parse}; do
local fname=${FILES}/apts/${file} local fname=${FILES}/apts/${file}
local OIFS line package distros distro local OIFS line package distros distro
[[ -e $fname ]] || { echo "missing: $fname"; exit 1 ;} [[ -e $fname ]] || { echo "missing: $fname"; exit 1 ;}
OIFS=$IFS OIFS=$IFS
IFS=$'\n' IFS=$'\n'
for line in $(cat ${fname});do for line in $(cat ${fname}); do
if [[ $line =~ "NOPRIME" ]];then if [[ $line =~ "NOPRIME" ]]; then
continue continue
fi fi
if [[ $line =~ (.*)#.*dist:([^ ]*) ]];then # We are using BASH regexp matching feature. if [[ $line =~ (.*)#.*dist:([^ ]*) ]]; then # We are using BASH regexp matching feature.
package=${BASH_REMATCH[1]} package=${BASH_REMATCH[1]}
distros=${BASH_REMATCH[2]} distros=${BASH_REMATCH[2]}
for distro in ${distros//,/ };do #In bash ${VAR,,} will lowecase VAR for distro in ${distros//,/ }; do #In bash ${VAR,,} will lowecase VAR
[[ ${distro,,} == ${DISTRO,,} ]] && echo $package [[ ${distro,,} == ${DISTRO,,} ]] && echo $package
done done
continue continue
@ -710,7 +710,7 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
sudo chown -R $USER:${USER_GROUP} ${SWIFT_DATA_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_DATA_LOCATION}/drives/images/swift.img ]];then if [[ ! -e ${SWIFT_DATA_LOCATION}/drives/images/swift.img ]]; then
mkdir -p ${SWIFT_DATA_LOCATION}/drives/images mkdir -p ${SWIFT_DATA_LOCATION}/drives/images
sudo touch ${SWIFT_DATA_LOCATION}/drives/images/swift.img sudo touch ${SWIFT_DATA_LOCATION}/drives/images/swift.img
sudo chown $USER: ${SWIFT_DATA_LOCATION}/drives/images/swift.img sudo chown $USER: ${SWIFT_DATA_LOCATION}/drives/images/swift.img
@ -723,7 +723,7 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
# 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_DATA_LOCATION}/drives/sdb1 mkdir -p ${SWIFT_DATA_LOCATION}/drives/sdb1
if ! egrep -q ${SWIFT_DATA_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_DATA_LOCATION}/drives/images/swift.img ${SWIFT_DATA_LOCATION}/drives/sdb1 ${SWIFT_DATA_LOCATION}/drives/images/swift.img ${SWIFT_DATA_LOCATION}/drives/sdb1
fi fi
@ -737,7 +737,7 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
tmpd="" tmpd=""
for d in ${SWIFT_DATA_LOCATION}/drives/sdb1/{1..4} \ for d in ${SWIFT_DATA_LOCATION}/drives/sdb1/{1..4} \
${SWIFT_CONFIG_LOCATION}/{object,container,account}-server \ ${SWIFT_CONFIG_LOCATION}/{object,container,account}-server \
${SWIFT_DATA_LOCATION}/{1..4}/node/sdb1 /var/run/swift ;do ${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
@ -786,7 +786,7 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
local log_facility=$3 local log_facility=$3
local node_number local node_number
for node_number in {1..4};do for node_number in {1..4}; do
node_path=${SWIFT_DATA_LOCATION}/${node_number} node_path=${SWIFT_DATA_LOCATION}/${node_number}
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}," \ 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 > ${SWIFT_CONFIG_LOCATION}/${server_type}-server/${node_number}.conf $FILES/swift/${server_type}-server.conf > ${SWIFT_CONFIG_LOCATION}/${server_type}-server/${node_number}.conf