@@ -275,3 +275,5 @@ Variables and Functions

 - local variables should be lower case, global variables should be

   upper case

 - function names should_have_underscores, NotCamelCase.

+- functions should be declared as per the regex ^function foo {$

+  with code starting on the next line

@@ -32,7 +32,7 @@ source $TOP_DIR/lib/cinder

 TEMPFILE=`mktemp`

 RECLONE=True

-function log_message() {

+function log_message {

     MESSAGE=$1

     STEP_HEADER=$2

     if [[ "$STEP_HEADER" = "True" ]]; then

@@ -57,7 +57,7 @@ AGGREGATE_NAME=test_aggregate_$RANDOM

 AGGREGATE2_NAME=test_aggregate_$RANDOM

 AGGREGATE_A_ZONE=nova

-exit_if_aggregate_present() {

+function exit_if_aggregate_present {

     aggregate_name=$1

     if [ $(nova aggregate-list | grep -c " $aggregate_name ") == 0 ]; then

@@ -154,7 +154,7 @@ set +o xtrace

 # Results

 # =======

-function report() {

+function report {

     if [[ -n "$2" ]]; then

         echo "$1: $2"

     fi

@@ -165,7 +165,7 @@ set +o xtrace

 # Results

 # =======

-function report() {

+function report {

     if [[ -n "$2" ]]; then

         echo "$1: $2"

     fi

@@ -20,7 +20,7 @@ echo "*********************************************************************"

 set -o errtrace

 trap failed ERR

-failed() {

+function failed {

     local r=$?

     set +o errtrace

     set +o xtrace

@@ -395,7 +395,7 @@ function test_functions {

 # Usage and main

 # --------------

-usage() {

+function usage {

     echo "$0: [-h]"

     echo "  -h, --help              Display help message"

     echo "  -t, --tenant            Create tenants"

@@ -408,7 +408,7 @@ usage() {

     echo "  -T, --test              Test functions"

 }

-main() {

+function main {

     echo Description

@@ -51,7 +51,7 @@ function cleanup_tmp {

 # - ``GLANCE_HOSTPORT``

 #

 # upload_image image-url glance-token

-function upload_image() {

+function upload_image {

     local image_url=$1

     local token=$2

@@ -341,7 +341,7 @@ function use_database {

 # Wait for an HTTP server to start answering requests

 # wait_for_service timeout url

-function wait_for_service() {

+function wait_for_service {

     local timeout=$1

     local url=$2

     timeout $timeout sh -c "while ! curl --noproxy '*' -s $url >/dev/null; do sleep 1; done"

@@ -351,7 +351,7 @@ function wait_for_service() {

 # ping check

 # Uses globals ``ENABLED_SERVICES``

 # ping_check from-net ip boot-timeout expected

-function ping_check() {

+function ping_check {

     if is_service_enabled neutron; then

         _ping_check_neutron  "$1" $2 $3 $4

         return

@@ -361,7 +361,7 @@ function ping_check() {

 # ping check for nova

 # Uses globals ``MULTI_HOST``, ``PRIVATE_NETWORK``

-function _ping_check_novanet() {

+function _ping_check_novanet {

     local from_net=$1

     local ip=$2

     local boot_timeout=$3

@@ -386,7 +386,7 @@ function _ping_check_novanet() {

 }

 # Get ip of instance

-function get_instance_ip(){

+function get_instance_ip {

     local vm_id=$1

     local network_name=$2

     local nova_result="$(nova show $vm_id)"

@@ -401,7 +401,7 @@ function get_instance_ip(){

 # ssh check

 # ssh_check net-name key-file floating-ip default-user active-timeout

-function ssh_check() {

+function ssh_check {

     if is_service_enabled neutron; then

         _ssh_check_neutron  "$1" $2 $3 $4 $5

         return

@@ -409,7 +409,7 @@ function ssh_check() {

     _ssh_check_novanet "$1" $2 $3 $4 $5

 }

-function _ssh_check_novanet() {

+function _ssh_check_novanet {

     local NET_NAME=$1

     local KEY_FILE=$2

     local FLOATING_IP=$3

@@ -425,7 +425,7 @@ function _ssh_check_novanet() {

 # Get the location of the $module-rootwrap executables, where module is cinder

 # or nova.

 # get_rootwrap_location module

-function get_rootwrap_location() {

+function get_rootwrap_location {

     local module=$1

     echo "$(get_python_exec_prefix)/$module-rootwrap"

@@ -434,7 +434,7 @@ function get_rootwrap_location() {

 # Path permissions sanity check

 # check_path_perm_sanity path

-function check_path_perm_sanity() {

+function check_path_perm_sanity {

     # Ensure no element of the path has 0700 permissions, which is very

     # likely to cause issues for daemons.  Inspired by default 0700

     # homedir permissions on RHEL and common practice of making DEST in

@@ -505,7 +505,7 @@ function _vercmp_r {

 # The above will return "0", as the versions are equal.

 #

 # vercmp_numbers ver1 ver2

-vercmp_numbers() {

+function vercmp_numbers {

     typeset v1=$1 v2=$2 sep

     typeset -a ver1 ver2

@@ -523,7 +523,7 @@ vercmp_numbers() {

 # Defaults are respectively 'project_name' and 'user_name'

 #

 # setup_colorized_logging something.conf SOMESECTION

-function setup_colorized_logging() {

+function setup_colorized_logging {

     local conf_file=$1

     local conf_section=$2

     local project_var=${3:-"project_name"}

@@ -38,7 +38,7 @@ set +o xtrace

 # Append a new option in an ini file without replacing the old value

 # iniadd config-file section option value1 value2 value3 ...

-function iniadd() {

+function iniadd {

     local xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local file=$1

@@ -52,7 +52,7 @@ function iniadd() {

 # Comment an option in an INI file

 # inicomment config-file section option

-function inicomment() {

+function inicomment {

     local xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local file=$1

@@ -64,7 +64,7 @@ function inicomment() {

 # Get an option from an INI file

 # iniget config-file section option

-function iniget() {

+function iniget {

     local xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local file=$1

@@ -78,7 +78,7 @@ function iniget() {

 # Get a multiple line option from an INI file

 # iniget_multiline config-file section option

-function iniget_multiline() {

+function iniget_multiline {

     local xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local file=$1

@@ -92,7 +92,7 @@ function iniget_multiline() {

 # Determinate is the given option present in the INI file

 # ini_has_option config-file section option

-function ini_has_option() {

+function ini_has_option {

     local xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local file=$1

@@ -106,7 +106,7 @@ function ini_has_option() {

 # Set an option in an INI file

 # iniset config-file section option value

-function iniset() {

+function iniset {

     local xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local file=$1

@@ -135,7 +135,7 @@ $option = $value

 # Set a multiple line option in an INI file

 # iniset_multiline config-file section option value1 value2 valu3 ...

-function iniset_multiline() {

+function iniset_multiline {

     local xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local file=$1

@@ -167,7 +167,7 @@ $option = $v

 # Uncomment an option in an INI file

 # iniuncomment config-file section option

-function iniuncomment() {

+function iniuncomment {

     local xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local file=$1

@@ -181,7 +181,7 @@ function iniuncomment() {

 # Accepts as False: 0 no No NO false False FALSE

 # Accepts as True: 1 yes Yes YES true True TRUE

 # VAR=$(trueorfalse default-value test-value)

-function trueorfalse() {

+function trueorfalse {

     local xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local default=$1

@@ -213,7 +213,7 @@ function backtrace {

 # Prints line number and "message" then exits

 # die $LINENO "message"

-function die() {

+function die {

     local exitcode=$?

     set +o xtrace

     local line=$1; shift

@@ -231,7 +231,7 @@ function die() {

 # exit code is non-zero and prints "message" and exits

 # NOTE: env-var is the variable name without a '$'

 # die_if_not_set $LINENO env-var "message"

-function die_if_not_set() {

+function die_if_not_set {

     local exitcode=$?

     FXTRACE=$(set +o | grep xtrace)

     set +o xtrace

@@ -245,7 +245,7 @@ function die_if_not_set() {

 # Prints line number and "message" in error format

 # err $LINENO "message"

-function err() {

+function err {

     local exitcode=$?

     errXTRACE=$(set +o | grep xtrace)

     set +o xtrace

@@ -262,7 +262,7 @@ function err() {

 # exit code is non-zero and prints "message"

 # NOTE: env-var is the variable name without a '$'

 # err_if_not_set $LINENO env-var "message"

-function err_if_not_set() {

+function err_if_not_set {

     local exitcode=$?

     errinsXTRACE=$(set +o | grep xtrace)

     set +o xtrace

@@ -291,14 +291,14 @@ function exit_distro_not_supported {

 # Test if the named environment variable is set and not zero length

 # is_set env-var

-function is_set() {

+function is_set {

     local var=\$"$1"

     eval "[ -n \"$var\" ]" # For ex.: sh -c "[ -n \"$var\" ]" would be better, but several exercises depends on this

 }

 # Prints line number and "message" in warning format

 # warn $LINENO "message"

-function warn() {

+function warn {

     local exitcode=$?

     errXTRACE=$(set +o | grep xtrace)

     set +o xtrace

@@ -324,7 +324,7 @@ function warn() {

 # os_PACKAGE - package type

 # os_CODENAME - vendor's codename for release

 # GetOSVersion

-GetOSVersion() {

+function GetOSVersion {

     # Figure out which vendor we are

     if [[ -x "`which sw_vers 2>/dev/null`" ]]; then

         # OS/X

@@ -414,7 +414,7 @@ GetOSVersion() {

 # Translate the OS version values into common nomenclature

 # Sets global ``DISTRO`` from the ``os_*`` values

-function GetDistro() {

+function GetDistro {

     GetOSVersion

     if [[ "$os_VENDOR" =~ (Ubuntu) || "$os_VENDOR" =~ (Debian) ]]; then

         # 'Everyone' refers to Ubuntu / Debian releases by the code name adjective

@@ -491,7 +491,7 @@ function is_ubuntu {

 # Returns openstack release name for a given branch name

 # ``get_release_name_from_branch branch-name``

-function get_release_name_from_branch(){

+function get_release_name_from_branch {

     local branch=$1

     if [[ $branch =~ "stable/" ]]; then

         echo ${branch#*/}

@@ -577,7 +577,7 @@ function git_clone {

 # to timeout(1); otherwise the default value of 0 maintains the status

 # quo of waiting forever.

 # usage: git_timed <git-command>

-function git_timed() {

+function git_timed {

     local count=0

     local timeout=0

@@ -603,7 +603,7 @@ function git_timed() {

 # git update using reference as a branch.

 # git_update_branch ref

-function git_update_branch() {

+function git_update_branch {

     GIT_BRANCH=$1

@@ -615,7 +615,7 @@ function git_update_branch() {

 # git update using reference as a branch.

 # git_update_remote_branch ref

-function git_update_remote_branch() {

+function git_update_remote_branch {

     GIT_BRANCH=$1

@@ -625,7 +625,7 @@ function git_update_remote_branch() {

 # git update using reference as a tag. Be careful editing source at that repo

 # as working copy will be in a detached mode

 # git_update_tag ref

-function git_update_tag() {

+function git_update_tag {

     GIT_TAG=$1

@@ -641,7 +641,7 @@ function git_update_tag() {

 # Get the default value for HOST_IP

 # get_default_host_ip fixed_range floating_range host_ip_iface host_ip

-function get_default_host_ip() {

+function get_default_host_ip {

     local fixed_range=$1

     local floating_range=$2

     local host_ip_iface=$3

@@ -673,7 +673,7 @@ function get_default_host_ip() {

 # Fields are numbered starting with 1

 # Reverse syntax is supported: -1 is the last field, -2 is second to last, etc.

 # get_field field-number

-function get_field() {

+function get_field {

     while read data; do

         if [ "$1" -lt 0 ]; then

             field="(\$(NF$1))"

@@ -687,7 +687,7 @@ function get_field() {

 # Add a policy to a policy.json file

 # Do nothing if the policy already exists

 # ``policy_add policy_file policy_name policy_permissions``

-function policy_add() {

+function policy_add {

     local policy_file=$1

     local policy_name=$2

     local policy_perm=$3

@@ -717,7 +717,7 @@ function policy_add() {

 # =================

 # _get_package_dir

-function _get_package_dir() {

+function _get_package_dir {

     local pkg_dir

     if is_ubuntu; then

         pkg_dir=$FILES/apts

@@ -734,7 +734,7 @@ function _get_package_dir() {

 # Wrapper for ``apt-get`` to set cache and proxy environment variables

 # Uses globals ``OFFLINE``, ``*_proxy``

 # apt_get operation package [package ...]

-function apt_get() {

+function apt_get {

     local xtrace=$(set +o | grep xtrace)

     set +o xtrace

@@ -759,7 +759,7 @@ function apt_get() {

 # - ``# NOPRIME`` defers installation to be performed later in `stack.sh`

 # - ``# dist:DISTRO`` or ``dist:DISTRO1,DISTRO2`` limits the selection

 #   of the package to the distros listed.  The distro names are case insensitive.

-function get_packages() {

+function get_packages {

     local xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local services=$@

@@ -870,7 +870,7 @@ function get_packages() {

 # Distro-agnostic package installer

 # install_package package [package ...]

-function install_package() {

+function install_package {

     local xtrace=$(set +o | grep xtrace)

     set +o xtrace

     if is_ubuntu; then

@@ -895,7 +895,7 @@ function install_package() {

 # Distro-agnostic function to tell if a package is installed

 # is_package_installed package [package ...]

-function is_package_installed() {

+function is_package_installed {

     if [[ -z "$@" ]]; then

         return 1

     fi

@@ -915,7 +915,7 @@ function is_package_installed() {

 # Distro-agnostic package uninstaller

 # uninstall_package package [package ...]

-function uninstall_package() {

+function uninstall_package {

     if is_ubuntu; then

         apt_get purge "$@"

     elif is_fedora; then

@@ -930,7 +930,7 @@ function uninstall_package() {

 # Wrapper for ``yum`` to set proxy environment variables

 # Uses globals ``OFFLINE``, ``*_proxy``

 # yum_install package [package ...]

-function yum_install() {

+function yum_install {

     [[ "$OFFLINE" = "True" ]] && return

     local sudo="sudo"

     [[ "$(id -u)" = "0" ]] && sudo="env"

@@ -941,7 +941,7 @@ function yum_install() {

 # zypper wrapper to set arguments correctly

 # zypper_install package [package ...]

-function zypper_install() {

+function zypper_install {

     [[ "$OFFLINE" = "True" ]] && return

     local sudo="sudo"

     [[ "$(id -u)" = "0" ]] && sudo="env"

@@ -958,7 +958,7 @@ function zypper_install() {

 # files to produce the same logs as screen_it().  The log filename is derived

 # from the service name and global-and-now-misnamed SCREEN_LOGDIR

 # _run_process service "command-line"

-function _run_process() {

+function _run_process {

     local service=$1

     local command="$2"

@@ -983,7 +983,7 @@ function _run_process() {

 # Helper to remove the ``*.failure`` files under ``$SERVICE_DIR/$SCREEN_NAME``.

 # This is used for ``service_check`` when all the ``screen_it`` are called finished

 # init_service_check

-function init_service_check() {

+function init_service_check {

     SCREEN_NAME=${SCREEN_NAME:-stack}

     SERVICE_DIR=${SERVICE_DIR:-${DEST}/status}

@@ -996,7 +996,7 @@ function init_service_check() {

 # Find out if a process exists by partial name.

 # is_running name

-function is_running() {

+function is_running {

     local name=$1

     ps auxw | grep -v grep | grep ${name} > /dev/null

     RC=$?

@@ -1009,7 +1009,7 @@ function is_running() {

 # of screen_it() without screen.  PIDs are written to

 # $SERVICE_DIR/$SCREEN_NAME/$service.pid

 # run_process service "command-line"

-function run_process() {

+function run_process {

     local service=$1

     local command="$2"

@@ -1092,7 +1092,7 @@ function screen_rc {

 # If screen is being used kill the screen window; this will catch processes

 # that did not leave a PID behind

 # screen_stop service

-function screen_stop() {

+function screen_stop {

     SCREEN_NAME=${SCREEN_NAME:-stack}

     SERVICE_DIR=${SERVICE_DIR:-${DEST}/status}

     USE_SCREEN=$(trueorfalse True $USE_SCREEN)

@@ -1112,7 +1112,7 @@ function screen_stop() {

 # Helper to get the status of each running service

 # service_check

-function service_check() {

+function service_check {

     local service

     local failures

     SCREEN_NAME=${SCREEN_NAME:-stack}

@@ -1145,7 +1145,7 @@ function service_check() {

 # Get the path to the pip command.

 # get_pip_command

-function get_pip_command() {

+function get_pip_command {

     which pip || which pip-python

     if [ $? -ne 0 ]; then

@@ -1155,7 +1155,7 @@ function get_pip_command() {

 # Get the path to the direcotry where python executables are installed.

 # get_python_exec_prefix

-function get_python_exec_prefix() {

+function get_python_exec_prefix {

     if is_fedora || is_suse; then

         echo "/usr/bin"

     else

@@ -1221,7 +1221,7 @@ function pip_install {

 #

 # Uses globals ``TRACK_DEPENDS``, ``REQUIREMENTS_DIR``, ``UNDO_REQUIREMENTS``

 # setup_develop directory

-function setup_develop() {

+function setup_develop {

     local project_dir=$1

     echo "cd $REQUIREMENTS_DIR; $SUDO_CMD python update.py $project_dir"

@@ -1257,7 +1257,7 @@ function setup_develop() {

 # using pip before running `setup.py develop`

 # Uses globals ``STACK_USER``

 # setup_develop_no_requirements_update directory

-function setup_develop_no_requirements_update() {

+function setup_develop_no_requirements_update {

     local project_dir=$1

     pip_install -e $project_dir

@@ -1271,7 +1271,7 @@ function setup_develop_no_requirements_update() {

 # remove extra commas from the input string (i.e. ``ENABLED_SERVICES``)

 # _cleanup_service_list service-list

-function _cleanup_service_list () {

+function _cleanup_service_list {

     echo "$1" | sed -e '

         s/,,/,/g;

         s/^,//;

@@ -1284,7 +1284,7 @@ function _cleanup_service_list () {

 # before a minimal installation

 # Uses global ``ENABLED_SERVICES``

 # disable_all_services

-function disable_all_services() {

+function disable_all_services {

     ENABLED_SERVICES=""

 }

@@ -1293,7 +1293,7 @@ function disable_all_services() {

 # ENABLED_SERVICES+=",-rabbit"

 # Uses global ``ENABLED_SERVICES``

 # disable_negated_services

-function disable_negated_services() {

+function disable_negated_services {

     local tmpsvcs="${ENABLED_SERVICES}"

     local service

     for service in ${tmpsvcs//,/ }; do

@@ -1314,7 +1314,7 @@ function disable_negated_services() {

 # for nova, glance, and neutron built into is_service_enabled().

 # Uses global ``ENABLED_SERVICES``

 # disable_service service [service ...]

-function disable_service() {

+function disable_service {

     local tmpsvcs=",${ENABLED_SERVICES},"

     local service

     for service in $@; do

@@ -1335,7 +1335,7 @@ function disable_service() {

 # for nova, glance, and neutron built into is_service_enabled().

 # Uses global ``ENABLED_SERVICES``

 # enable_service service [service ...]

-function enable_service() {

+function enable_service {

     local tmpsvcs="${ENABLED_SERVICES}"

     for service in $@; do

         if ! is_service_enabled $service; then

@@ -1369,7 +1369,7 @@ function enable_service() {

 #

 # Uses global ``ENABLED_SERVICES``

 # is_service_enabled service [service ...]

-function is_service_enabled() {

+function is_service_enabled {

     local xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local enabled=1

@@ -1424,7 +1424,7 @@ function use_exclusive_service {

 # Only run the command if the target file (the last arg) is not on an

 # NFS filesystem.

-function _safe_permission_operation() {

+function _safe_permission_operation {

     local xtrace=$(set +o | grep xtrace)

     set +o xtrace

     local args=( $@ )

@@ -1457,7 +1457,7 @@ function _safe_permission_operation() {

 # Exit 0 if address is in network or 1 if address is not in network

 # ip-range is in CIDR notation: 1.2.3.4/20

 # address_in_net ip-address ip-range

-function address_in_net() {

+function address_in_net {

     local ip=$1

     local range=$2

     local masklen=${range#*/}

@@ -1468,7 +1468,7 @@ function address_in_net() {

 # Add a user to a group.

 # add_user_to_group user group

-function add_user_to_group() {

+function add_user_to_group {

     local user=$1

     local group=$2

@@ -1486,7 +1486,7 @@ function add_user_to_group() {

 # Convert CIDR notation to a IPv4 netmask

 # cidr2netmask cidr-bits

-function cidr2netmask() {

+function cidr2netmask {

     local maskpat="255 255 255 255"

     local maskdgt="254 252 248 240 224 192 128"

     set -- ${maskpat:0:$(( ($1 / 8) * 4 ))}${maskdgt:$(( (7 - ($1 % 8)) * 4 )):3}

@@ -1509,7 +1509,7 @@ function cp_it {

 #

 #     http_proxy=http://proxy.example.com:3128/ no_proxy=repo.example.net ./stack.sh

-function export_proxy_variables() {

+function export_proxy_variables {

     if [[ -n "$http_proxy" ]]; then

         export http_proxy=$http_proxy

     fi

@@ -1522,7 +1522,7 @@ function export_proxy_variables() {

 }

 # Returns true if the directory is on a filesystem mounted via NFS.

-function is_nfs_directory() {

+function is_nfs_directory {

     local mount_type=`stat -f -L -c %T $1`

     test "$mount_type" == "nfs"

 }

@@ -1530,7 +1530,7 @@ function is_nfs_directory() {

 # Return the network portion of the given IP address using netmask

 # netmask is in the traditional dotted-quad format

 # maskip ip-address netmask

-function maskip() {

+function maskip {

     local ip=$1

     local mask=$2

     local l="${ip%.*}"; local r="${ip#*.}"; local n="${mask%.*}"; local m="${mask#*.}"

@@ -1540,7 +1540,7 @@ function maskip() {

 # Service wrapper to restart services

 # restart_service service-name

-function restart_service() {

+function restart_service {

     if is_ubuntu; then

         sudo /usr/sbin/service $1 restart

     else

@@ -1550,19 +1550,19 @@ function restart_service() {

 # Only change permissions of a file or directory if it is not on an

 # NFS filesystem.

-function safe_chmod() {

+function safe_chmod {

     _safe_permission_operation chmod $@

 }

 # Only change ownership of a file or directory if it is not on an NFS

 # filesystem.

-function safe_chown() {

+function safe_chown {

     _safe_permission_operation chown $@

 }

 # Service wrapper to start services

 # start_service service-name

-function start_service() {

+function start_service {

     if is_ubuntu; then

         sudo /usr/sbin/service $1 start

     else

@@ -1572,7 +1572,7 @@ function start_service() {

 # Service wrapper to stop services

 # stop_service service-name

-function stop_service() {

+function stop_service {

     if is_ubuntu; then

         sudo /usr/sbin/service $1 stop

     else

@@ -50,7 +50,7 @@ fi

 #

 # Uses global ``APACHE_ENABLED_SERVICES``

 # APACHE_ENABLED_SERVICES service [service ...]

-function is_apache_enabled_service() {

+function is_apache_enabled_service {

     services=$@

     for service in ${services}; do

         [[ ,${APACHE_ENABLED_SERVICES}, =~ ,${service}, ]] && return 0

@@ -59,7 +59,7 @@ function is_apache_enabled_service() {

 }

 # install_apache_wsgi() - Install Apache server and wsgi module

-function install_apache_wsgi() {

+function install_apache_wsgi {

     # Apache installation, because we mark it NOPRIME

     if is_ubuntu; then

         # Install apache2, which is NOPRIME'd

@@ -79,7 +79,7 @@ function install_apache_wsgi() {

 }

 # enable_apache_site() - Enable a particular apache site

-function enable_apache_site() {

+function enable_apache_site {

     local site=$@

     if is_ubuntu; then

         sudo a2ensite ${site}

@@ -90,7 +90,7 @@ function enable_apache_site() {

 }

 # disable_apache_site() - Disable a particular apache site

-function disable_apache_site() {

+function disable_apache_site {

     local site=$@

     if is_ubuntu; then

         sudo a2dissite ${site}

@@ -100,12 +100,12 @@ function disable_apache_site() {

 }

 # start_apache_server() - Start running apache server

-function start_apache_server() {

+function start_apache_server {

     start_service $APACHE_NAME

 }

 # stop_apache_server() - Stop running apache server

-function stop_apache_server() {

+function stop_apache_server {

     if [ -n "$APACHE_NAME" ]; then

         stop_service $APACHE_NAME

     else

@@ -114,7 +114,7 @@ function stop_apache_server() {

 }

 # restart_apache_server

-function restart_apache_server() {

+function restart_apache_server {

     restart_service $APACHE_NAME

 }

@@ -166,7 +166,7 @@ BM_SHELL_IN_A_BOX=${BM_SHELL_IN_A_BOX:-http://shellinabox.googlecode.com/files/s

 # Check if baremetal is properly enabled

 # Returns false if VIRT_DRIVER is not baremetal, or if ENABLED_SERVICES

 # does not contain "baremetal"

-function is_baremetal() {

+function is_baremetal {

     if [[ "$ENABLED_SERVICES" =~ 'baremetal' && "$VIRT_DRIVER" = 'baremetal' ]]; then

         return 0

     fi

@@ -175,7 +175,7 @@ function is_baremetal() {

 # Install diskimage-builder and shell-in-a-box

 # so that we can build the deployment kernel & ramdisk

-function prepare_baremetal_toolchain() {

+function prepare_baremetal_toolchain {

     git_clone $BM_IMAGE_BUILD_REPO $BM_IMAGE_BUILD_DIR $BM_IMAGE_BUILD_BRANCH

     git_clone $BM_POSEUR_REPO $BM_POSEUR_DIR $BM_POSEUR_BRANCH

@@ -197,7 +197,7 @@ function prepare_baremetal_toolchain() {

 }

 # set up virtualized environment for devstack-gate testing

-function create_fake_baremetal_env() {

+function create_fake_baremetal_env {

     local bm_poseur="$BM_POSEUR_DIR/bm_poseur"

     # TODO(deva): add support for >1 VM

     sudo $bm_poseur $BM_POSEUR_EXTRA_OPTS create-bridge

@@ -211,14 +211,14 @@ function create_fake_baremetal_env() {

     BM_SECOND_MAC='12:34:56:78:90:12'

 }

-function cleanup_fake_baremetal_env() {

+function cleanup_fake_baremetal_env {

     local bm_poseur="$BM_POSEUR_DIR/bm_poseur"

     sudo $bm_poseur $BM_POSEUR_EXTRA_OPTS destroy-vm

     sudo $bm_poseur $BM_POSEUR_EXTRA_OPTS destroy-bridge

 }

 # prepare various directories needed by baremetal hypervisor

-function configure_baremetal_nova_dirs() {

+function configure_baremetal_nova_dirs {

     # ensure /tftpboot is prepared

     sudo mkdir -p /tftpboot

     sudo mkdir -p /tftpboot/pxelinux.cfg

@@ -249,7 +249,7 @@ function configure_baremetal_nova_dirs() {

 # build deploy kernel+ramdisk, then upload them to glance

 # this function sets BM_DEPLOY_KERNEL_ID and BM_DEPLOY_RAMDISK_ID

-function upload_baremetal_deploy() {

+function upload_baremetal_deploy {

     token=$1

     if [ "$BM_BUILD_DEPLOY_RAMDISK" = "True" ]; then

@@ -281,7 +281,7 @@ function upload_baremetal_deploy() {

 # create a basic baremetal flavor, associated with deploy kernel & ramdisk

 #

 # Usage: create_baremetal_flavor <aki_uuid> <ari_uuid>

-function create_baremetal_flavor() {

+function create_baremetal_flavor {

     aki=$1

     ari=$2

     nova flavor-create $BM_FLAVOR_NAME $BM_FLAVOR_ID \

@@ -298,7 +298,7 @@ function create_baremetal_flavor() {

 # Sets KERNEL_ID and RAMDISK_ID

 #

 # Usage: extract_and_upload_k_and_r_from_image $token $file

-function extract_and_upload_k_and_r_from_image() {

+function extract_and_upload_k_and_r_from_image {

     token=$1

     file=$2

     image_name=$(basename "$file" ".qcow2")

@@ -339,7 +339,7 @@ function extract_and_upload_k_and_r_from_image() {

 # Takes the same parameters, but has some peculiarities which made it

 # easier to create a separate method, rather than complicate the logic

 # of the existing function.

-function upload_baremetal_image() {

+function upload_baremetal_image {

     local image_url=$1

     local token=$2

@@ -429,7 +429,7 @@ function upload_baremetal_image() {

     DEFAULT_IMAGE_NAME="${IMAGE_NAME%.img}"

 }

-function clear_baremetal_of_all_nodes() {

+function clear_baremetal_of_all_nodes {

     list=$(nova baremetal-node-list | awk -F '| ' 'NR>3 {print $2}' )

     for node in $list; do

         nova baremetal-node-delete $node

@@ -440,7 +440,7 @@ function clear_baremetal_of_all_nodes() {

 # Defaults to using BM_FIRST_MAC and BM_SECOND_MAC if parameters not specified

 #

 # Usage: add_baremetal_node <first_mac> <second_mac>

-function add_baremetal_node() {

+function add_baremetal_node {

     mac_1=${1:-$BM_FIRST_MAC}

     mac_2=${2:-$BM_SECOND_MAC}