Skip to content

Commit 3324f19

Browse files
author
Dean Troyer
committed
Fix docs build errors
Fix shocco errors during docs generation Closes-Bug: 1362691 Change-Id: I2b7fb008c89f0b4e7280b2d0a054320765e83e47
1 parent 7672ad1 commit 3324f19

11 files changed

Lines changed: 26 additions & 23 deletions

File tree

functions

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ function upload_image {
7171
fi
7272
image="$FILES/${image_fname}"
7373
else
74-
# File based URL (RFC 1738): file://host/path
74+
# File based URL (RFC 1738): ``file://host/path``
7575
# Remote files are not considered here.
76-
# *nix: file:///home/user/path/file
77-
# windows: file:///C:/Documents%20and%20Settings/user/path/file
76+
# unix: ``file:///home/user/path/file``
77+
# windows: ``file:///C:/Documents%20and%20Settings/user/path/file``
7878
image=$(echo $image_url | sed "s/^file:\/\///g")
7979
if [[ ! -f $image || "$(stat -c "%s" $image)" == "0" ]]; then
8080
echo "Not found: $image_url"
@@ -123,7 +123,7 @@ function upload_image {
123123
if [[ "$vmdk_create_type" = "monolithicSparse" ]]; then
124124
vmdk_disktype="sparse"
125125
elif [[ "$vmdk_create_type" = "monolithicFlat" || "$vmdk_create_type" = "vmfs" ]]; then
126-
# Attempt to retrieve the *-flat.vmdk
126+
# Attempt to retrieve the ``*-flat.vmdk``
127127
local flat_fname="$(head -25 $image | { grep -G 'RW\|RDONLY [0-9]+ FLAT\|VMFS' $image || true; })"
128128
flat_fname="${flat_fname#*\"}"
129129
flat_fname="${flat_fname%?}"

functions-common

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
# - ``TRACK_DEPENDS``
3232
# - ``UNDO_REQUIREMENTS``
3333
# - ``http_proxy``, ``https_proxy``, ``no_proxy``
34+
#
3435

3536
# Save trace setting
3637
XTRACE=$(set +o | grep xtrace)
@@ -1253,7 +1254,8 @@ function screen_service {
12531254
# - the pid of the background process is saved in the usual place
12541255
# - the server process is brought back to the foreground
12551256
# - if the server process exits prematurely the fg command errors
1256-
# and a message is written to stdout and the service failure file
1257+
# and a message is written to stdout and the service failure file
1258+
#
12571259
# The pid saved can be used in stop_process() as a process group
12581260
# id to kill off all child processes
12591261
if [[ -n "$group" ]]; then

lib/cinder_backends/xiv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#
1717
# Authors:
1818
# Alon Marx <alonma@il.ibm.com>
19+
#
1920

2021
# lib/cinder_plugins/xiv
2122
# Configure the xiv_ds8k driver for xiv testing
@@ -61,7 +62,7 @@ function configure_cinder_backend_xiv {
6162
fi
6263

6364
# For reference:
64-
# XIV_DS8K_BACKEND='IBM-XIV_'${SAN_IP}'_'${SAN_CLUSTERNAME}'_'${CONNECTION_TYPE}
65+
# ``XIV_DS8K_BACKEND='IBM-XIV_'${SAN_IP}'_'${SAN_CLUSTERNAME}'_'${CONNECTION_TYPE}``
6566
iniset $CINDER_CONF DEFAULT xiv_ds8k_driver_version $XIV_DRIVER_VERSION
6667

6768
iniset $CINDER_CONF $be_name san_ip $SAN_IP

lib/neutron

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,10 @@ fi
177177

178178
# Distributed Virtual Router (DVR) configuration
179179
# Can be:
180-
# legacy - No DVR functionality
181-
# dvr_snat - Controller or single node DVR
182-
# dvr - Compute node in multi-node DVR
180+
# - ``legacy`` - No DVR functionality
181+
# - ``dvr_snat`` - Controller or single node DVR
182+
# - ``dvr`` - Compute node in multi-node DVR
183+
#
183184
Q_DVR_MODE=${Q_DVR_MODE:-legacy}
184185
if [[ "$Q_DVR_MODE" != "legacy" ]]; then
185186
Q_ML2_PLUGIN_MECHANISM_DRIVERS=openvswitch,linuxbridge,l2population

lib/neutron_plugins/oneconvergence

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Neutron One Convergence plugin
2-
# ---------------------------
2+
# ------------------------------
3+
34
# Save trace setting
45
OC_XTRACE=$(set +o | grep xtrace)
56
set +o xtrace

lib/nova

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ function start_nova_compute {
677677

678678
if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then
679679
# The group **$LIBVIRT_GROUP** is added to the current user in this script.
680-
# sg' will be used in run_process to execute nova-compute as a member of the
680+
# ``sg`` is used in run_process to execute nova-compute as a member of the
681681
# **$LIBVIRT_GROUP** group.
682682
run_process n-cpu "$NOVA_BIN_DIR/nova-compute --config-file $compute_cell_conf" $LIBVIRT_GROUP
683683
elif [[ "$VIRT_DRIVER" = 'fake' ]]; then

lib/nova_plugins/functions-libvirt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LV_XTRACE=$(set +o | grep xtrace)
1010
set +o xtrace
1111

1212
# Defaults
13-
# -------
13+
# --------
1414

1515
# if we should turn on massive libvirt debugging
1616
DEBUG_LIBVIRT=$(trueorfalse False $DEBUG_LIBVIRT)

lib/opendaylight

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
# Dependencies:
55
#
6-
# - ``functions`` file
7-
# # ``DEST`` must be defined
8-
# # ``STACK_USER`` must be defined
6+
# ``functions`` file
7+
# ``DEST`` must be defined
8+
# ``STACK_USER`` must be defined
99

1010
# ``stack.sh`` calls the entry points in this order:
1111
#
@@ -55,7 +55,7 @@ ODL_URL=${ODL_URL:-https://nexus.opendaylight.org/content/repositories/opendayli
5555

5656
# Default arguments for OpenDaylight. This is typically used to set
5757
# Java memory options.
58-
# ODL_ARGS=Xmx1024m -XX:MaxPermSize=512m
58+
# ``ODL_ARGS=Xmx1024m -XX:MaxPermSize=512m``
5959
ODL_ARGS=${ODL_ARGS:-"-XX:MaxPermSize=384m"}
6060

6161
# How long to pause after ODL starts to let it complete booting
@@ -64,8 +64,6 @@ ODL_BOOT_WAIT=${ODL_BOOT_WAIT:-60}
6464
# The physical provider network to device mapping
6565
ODL_PROVIDER_MAPPINGS=${ODL_PROVIDER_MAPPINGS:-physnet1:eth1}
6666

67-
# Set up default directories
68-
6967

7068
# Entry Points
7169
# ------------
@@ -139,6 +137,7 @@ function start_opendaylight {
139137
# The flags to ODL have the following meaning:
140138
# -of13: runs ODL using OpenFlow 1.3 protocol support.
141139
# -virt ovsdb: Runs ODL in "virtualization" mode with OVSDB support
140+
142141
# NOTE(chdent): Leaving this as screen_it instead of run_process until
143142
# the right thing for this service is determined.
144143
screen_it odl-server "cd $ODL_DIR/opendaylight && JAVA_HOME=$JHOME ./run.sh $ODL_ARGS -of13 -virt ovsdb"

lib/tls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ function start_tls_proxy {
383383

384384

385385
# Cleanup Functions
386-
# ===============
386+
# =================
387387

388388

389389
# Stops all stud processes. This should be done only after all services

stackrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ GIT_TIMEOUT=${GIT_TIMEOUT:-0}
117117
# ------------
118118

119119
# Base GIT Repo URL
120-
# Another option is http://review.openstack.org/p
120+
# Another option is https://git.openstack.org
121121
GIT_BASE=${GIT_BASE:-git://git.openstack.org}
122122

123123
# metering service

0 commit comments

Comments
 (0)