glance-api.conf in OpenStack Configuration Reference - juno

[Bjørnar Ness]

Config reference does not reflect "new, updated and depricated options" on http://docs.openstack.org/trunk/config-reference/content/glance-conf-changes-icehouse.html

In particular I am thinking of the following:

disk_formats => image_format/disk_formats
container_formats => image_format/container_formats

-----------------------------------
Built: 2014-08-04T20:34:06 00:00
git SHA: 371e97fbc297170b9a24c56b77d2f3d88bf4edf2
URL: http://docs.openstack.org/trunk/config-reference/content/section_glance-api.conf.html
source File: file:/home/jenkins/workspace/openstack-manuals-tox-doc-publishdocs/doc/config-reference/image-service/section_image-service-sample-configuration-files.xml
xml:id: section_glance-api.conf

[Tom Fifield (fifieldt)]

Code today is this:

image_format_opts = [
    cfg.ListOpt('container_formats',
                default=['ami', 'ari', 'aki', 'bare', 'ovf', 'ova'],
                help=_("Supported values for the 'container_format' "
                       "image attribute"),
                deprecated_opts=[cfg.DeprecatedOpt('container_formats',
                                                   group='DEFAULT')]),
    cfg.ListOpt('disk_formats',
                default=['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2',
                         'vdi', 'iso'],
                help=_("Supported values for the 'disk_format' "
                       "image attribute"),
                deprecated_opts=[cfg.DeprecatedOpt('disk_formats',
                                                   group='DEFAULT')]),
]

[Tom Fifield (fifieldt)]

Confirming that the sample config file is out of date @ http://docs.openstack.org/trunk/config-reference/content/section_glance-api.conf.html

[Tom Fifield (fifieldt)]

This is a docbug, as we're pulling in the icehouse config files:

eg

http://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api.conf?h=stable/icehouse

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/115256

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/115256
Committed: https://git.openstack.org/cgit/openstack/openstack-manuals/commit/?id=8b2016b5d035b3475fe197b2132a8e1e8abff350
Submitter: Jenkins
Branch: master

commit 8b2016b5d035b3475fe197b2132a8e1e8abff350
Author: Gauvain Pocentek <email address hidden>
Date: Tue Aug 19 11:22:22 2014 +0200

    Update the config reference tables

    Include the new tables in the documentation.

    Fix the cinder-prophetstor_dpl.xml filename and the xiv category.

    Manually fix those files for niceness test:
    - glance-logging.xml (lines 34, 38), fixed in oslo-incubator
    - trove-logging.xml (lines 26, 30), fixed in oslo-incubator
    - neutron-openvswitch_agent.xml (line 45), to be fixed in neutron

    Closes-Bug: #1340858
    Closes-Bug: #1344231
    Closes-Bug: #1345956
    Closes-Bug: #1346711
    Closes-Bug: #1347978
    Partial-Bug: #1348329
    Closes-Bug: #1352074
    Partial-Bug: #1353417
    Closes-Bug: #1354622
    Closes-Bug: #1339754
    Closes-Bug: #1358598
    Closes-Bug: #1358259
    Closes-Bug: #1357865
    Partial-Bug: #1357457
    Closes-Bug: #1357421
    Change-Id: Id2da7d7762ca954bd552dbf89a9ff28b144efb68