openstack/devstack
Code Issues Proposed changes

Fix shocco errors

Browse Source 
Clean up comments to fix errors seen while processing with shocco

Change-Id: I0e97ad27613313f03e47c107051ea93b115d4744
This commit is contained in:
Dean Troyer 2014-02-17 11:00:42 -06:00
parent 83f7736dcf
commit d8864feae9
7 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
driver_certs/cinder_driver_cert.sh
View File

@ -16,6 +16,7 @@
# It also assumes default install location (/opt/stack/xxx) # It also assumes default install location (/opt/stack/xxx)
# to aid in debug, you should also verify that you've added # to aid in debug, you should also verify that you've added
# an output directory for screen logs: # an output directory for screen logs:
#
# SCREEN_LOGDIR=/opt/stack/screen-logs # SCREEN_LOGDIR=/opt/stack/screen-logs
CERT_DIR=$(cd $(dirname "$0") && pwd) CERT_DIR=$(cd $(dirname "$0") && pwd)

7
functions
View File

@ -2,10 +2,15 @@
# #
# The following variables are assumed to be defined by certain functions: # The following variables are assumed to be defined by certain functions:
# #
# - ``DATABASE_BACKENDS``
# - ``ENABLED_SERVICES`` # - ``ENABLED_SERVICES``
# - ``FILES`` # - ``FILES``
# - ``GLANCE_HOSTPORT`` # - ``GLANCE_HOSTPORT``
# - ``REQUIREMENTS_DIR``
# - ``STACK_USER``
# - ``TRACK_DEPENDS`` # - ``TRACK_DEPENDS``
# - ``UNDO_REQUIREMENTS``
#
# Include the common functions # Include the common functions
FUNC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd) FUNC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd)
@ -45,7 +50,7 @@ function cleanup_tmp {
# Updates the dependencies in project_dir from the # Updates the dependencies in project_dir from the
# openstack/requirements global list before installing anything. # openstack/requirements global list before installing anything.
# #
# Uses globals ``TRACK_DEPENDS``, ``REQUIREMENTS_DIR`` # Uses globals ``TRACK_DEPENDS``, ``REQUIREMENTS_DIR``, ``UNDO_REQUIREMENTS``
# setup_develop directory # setup_develop directory
function setup_develop() { function setup_develop() {
local project_dir=$1 local project_dir=$1

4
lib/apache
View File

@ -4,8 +4,8 @@
# Dependencies: # Dependencies:
# #
# - ``functions`` file # - ``functions`` file
# -``STACK_USER`` must be defined # - ``STACK_USER`` must be defined
#
# lib/apache exports the following functions: # lib/apache exports the following functions:
# #
# - is_apache_enabled_service # - is_apache_enabled_service

3
lib/marconi
View File

@ -2,7 +2,8 @@
# Install and start **Marconi** service # Install and start **Marconi** service
# To enable a minimal set of Marconi services, add the following to localrc: # To enable a minimal set of Marconi services, add the following to localrc:
# enable_service marconi-server #
# enable_service marconi-server
# #
# Dependencies: # Dependencies:
# - functions # - functions

5
lib/stackforge
View File

@ -6,8 +6,9 @@
# This is appropriate for python libraries that release to pypi and are # This is appropriate for python libraries that release to pypi and are
# expected to be used beyond OpenStack like, but are requirements # expected to be used beyond OpenStack like, but are requirements
# for core services in global-requirements. # for core services in global-requirements.
# * wsme #
# * pecan # * wsme
# * pecan
# #
# This is not appropriate for stackforge projects which are early stage # This is not appropriate for stackforge projects which are early stage
# OpenStack tools # OpenStack tools

4
tools/create_userrc.sh
View File

@ -54,9 +54,7 @@ $0 -P -C mytenant -u myuser -p mypass
EOF EOF
} }
if ! options=$(getopt -o hPAp:u:r:C: -l os-username:,os-password:,os-tenant-name:,os-tenant-id:,os-auth-url:,target-dir:,skip-tenant:,os-cacert:,help,debug -- "$@") if ! options=$(getopt -o hPAp:u:r:C: -l os-username:,os-password:,os-tenant-name:,os-tenant-id:,os-auth-url:,target-dir:,skip-tenant:,os-cacert:,help,debug -- "$@"); then
then
#parse error
display_help display_help
exit 1 exit 1
fi fi

3
tools/fixup_stuff.sh
View File

@ -70,7 +70,8 @@ if [[ -d $dir ]]; then
fi fi
# Ubuntu 12.04 # Ubuntu 12.04
# ----- # ------------
# We can regularly get kernel crashes on the 12.04 default kernel, so attempt # We can regularly get kernel crashes on the 12.04 default kernel, so attempt
# to install a new kernel # to install a new kernel
if [[ ${DISTRO} =~ (precise) ]]; then if [[ ${DISTRO} =~ (precise) ]]; then