Merge "Turn docs warnings into errors and fix issues"

This commit is contained in:
Jenkins 2015-05-06 17:48:16 +00:00 committed by Gerrit Code Review
commit 5ee056ab7e
10 changed files with 38 additions and 28 deletions

View File

@ -105,7 +105,7 @@ html_theme = 'default'
# Add any paths that contain custom static files (such as style sheets) here, # Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files, # relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css". # so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static'] #html_static_path = ['_static']
# Add any extra paths that contain custom files (such as robots.txt or # Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied # .htaccess) here, relative to this directory. These files are copied

View File

@ -2,6 +2,7 @@ Copyright
========= =========
Copyright 2012 Hewlett-Packard Development Company, L.P. Copyright 2012 Hewlett-Packard Development Company, L.P.
Copyright (c) 2012 NTT DOCOMO, INC. Copyright (c) 2012 NTT DOCOMO, INC.
All Rights Reserved. All Rights Reserved.

View File

@ -28,7 +28,7 @@ Components
**DEPRECATED** Extract the appropriate kernel and ramdisk to use when doing **DEPRECATED** Extract the appropriate kernel and ramdisk to use when doing
PXE boot using filename as the image for a machine. Consider using the PXE boot using filename as the image for a machine. Consider using the
:ref:`baremetal` element, rather than this tool. :ref:`element-baremetal` element, rather than this tool.
`element-info` `element-info`

View File

@ -185,7 +185,7 @@ possible approach to this would be to label elements as either a "driver",
"service", or "config" element. Below are some examples. "service", or "config" element. Below are some examples.
- Driver-specific elements should only contain the necessary bits for that - Driver-specific elements should only contain the necessary bits for that
driver: driver::
elements/ elements/
driver-mellanox/ driver-mellanox/
@ -194,7 +194,7 @@ possible approach to this would be to label elements as either a "driver",
10-mlx - package installation 10-mlx - package installation
- An element that installs and configures Nova might be a bit more complex, - An element that installs and configures Nova might be a bit more complex,
containing several scripts across several phases: containing several scripts across several phases::
elements/ elements/
service-nova/ service-nova/

View File

@ -17,3 +17,4 @@ easier.
user_guide/index user_guide/index
developer/index developer/index
elements elements
copyright

View File

@ -1,3 +1,5 @@
.. _element-baremetal:
========= =========
baremetal baremetal
========= =========

View File

@ -5,7 +5,7 @@ Map package names to distro specific packages.
Provides the following: Provides the following:
* bin/pkg-map * bin/pkg-map::
usage: pkg-map [-h] [--element ELEMENT] [--distro DISTRO] usage: pkg-map [-h] [--element ELEMENT] [--distro DISTRO]
@ -21,6 +21,7 @@ Provides the following:
the one of 3 sections for the distro/family/ and or default. the one of 3 sections for the distro/family/ and or default.
The family is set automatically within pkg-map based on The family is set automatically within pkg-map based on
the supplied distro name. Families include: the supplied distro name. Families include:
+ redhat: includes centos, fedora, and rhel distros + redhat: includes centos, fedora, and rhel distros
+ debian: includes debian and ubuntu distros + debian: includes debian and ubuntu distros
+ suse: includes the opensuse distro + suse: includes the opensuse distro
@ -31,7 +32,8 @@ Provides the following:
for Fedora and package mapping for suse family to provide a good for Fedora and package mapping for suse family to provide a good
example!) example!)
Example format: Example format::
{ {
"distro": { "distro": {
"fedora": { "fedora": {

View File

@ -26,7 +26,7 @@ risk.
IMPORTANT NOTE: IMPORTANT NOTE:
---------------- ----------------
The 00-rhsm script is specific to RHEL6. If you use the REG_ variables to The 00-rhsm script is specific to RHEL6. If you use the REG\_ variables to
use with RHEL7, you do not need to set any DIB_RHSM variables. The scripts use with RHEL7, you do not need to set any DIB_RHSM variables. The scripts
named with "rhel-registration" have not been developed or tested for RHEL6. named with "rhel-registration" have not been developed or tested for RHEL6.
For information on building RHEL6 images, please see the rhel element README. For information on building RHEL6 images, please see the rhel element README.
@ -214,7 +214,7 @@ Heat metadata can be used to configure the rhel-common element.
Configuration Registration Examples Configuration Registration Examples
------------------------------------ ------------------------------------
To register with Satellite 6, a common example would be to use the following To register with Satellite 6, a common example would be to use the following
metadata: metadata::
{ {
"rh_registration":{ "rh_registration":{
@ -222,13 +222,13 @@ metadata:
"org": "tripleo", "org": "tripleo",
"environment": "Library", "environment": "Library",
"activation_key": "my-key-SQQkh4", "activation_key": "my-key-SQQkh4",
"method":"satellite" "method":"satellite",
"repos": "rhel-ha-for-rhel-7-server-rpms" "repos": "rhel-ha-for-rhel-7-server-rpms"
} }
} }
To register with the Red Hat Customer Portal, a common example would be to To register with the Red Hat Customer Portal, a common example would be to
use the following metadata: use the following metadata::
{ {
"rh_registration":{ "rh_registration":{

View File

@ -18,6 +18,7 @@ Provides the following:
the one of 3 sections for the distro/family/ and or default. the one of 3 sections for the distro/family/ and or default.
The family is set automatically within svc-map based on The family is set automatically within svc-map based on
the supplied distro name. Families include: the supplied distro name. Families include:
+ redhat: includes centos, fedora, and rhel distros + redhat: includes centos, fedora, and rhel distros
+ debian: includes debian and ubuntu distros + debian: includes debian and ubuntu distros
+ suse: includes the opensuse distro + suse: includes the opensuse distro
@ -30,7 +31,7 @@ Provides the following:
the source name against systemd and upstart and return that name if it the source name against systemd and upstart and return that name if it
exists instead of the mapped name. exists instead of the mapped name.
Example format for Nova: Example format for Nova::
nova-api: nova-api:
default: openstack-nova-api default: openstack-nova-api
@ -49,7 +50,7 @@ Provides the following:
debian: nova-console debian: nova-console
Example format for Glance Example format for Glance::
glance-api: glance-api:
debian: glance-api debian: glance-api
@ -59,7 +60,7 @@ Provides the following:
default: openstack-glance-registry default: openstack-glance-registry
If the distro is of the debian family the combined services file would be: If the distro is of the debian family the combined services file would be::
nova-cert: nova-cert nova-cert: nova-cert
nova-compute: nova-compute nova-compute: nova-compute
@ -70,7 +71,7 @@ Provides the following:
nova-consoleauth: nova-console nova-consoleauth: nova-console
If the distro is of the suse or redhat families the combined services file would be: If the distro is of the suse or redhat families the combined services file would be::
nova-cert: openstack-nova-cert nova-cert: openstack-nova-cert
nova-compute: openstack-nova-compute nova-compute: openstack-nova-compute
@ -81,7 +82,7 @@ Provides the following:
nova-api: openstack-nova-api nova-api: openstack-nova-api
Example commands using this format: Example commands using this format::
svc-map nova-compute svc-map nova-compute

View File

@ -41,6 +41,9 @@ keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg mapping_file = babel.cfg
output_file = diskimage_builder/locale/diskimage_builder.pot output_file = diskimage_builder/locale/diskimage_builder.pot
[pbr]
warnerrors = True
[update_catalog] [update_catalog]
domain = diskimage_builder domain = diskimage_builder
output_dir = diskimage_builder/locale output_dir = diskimage_builder/locale