Merge "Add links to the standalone configdrive documentation"

This commit is contained in:
Jenkins 2016-02-22 08:10:44 +00:00 committed by Gerrit Code Review
commit 7b027f1b79

View File

@ -2161,7 +2161,7 @@ For the format of the configuration drive, Bare Metal service expects a
``gzipped`` and ``base64`` encoded ISO 9660 [*]_ file with a ``config-2``
label. The
`ironic client <https://github.com/openstack/python-ironicclient>`_
can generate a configuration drive in the expected format. Just pass a
can generate a configuration drive in the `expected format`_. Just pass a
directory path containing the files that will be injected into it via the
``--config-drive`` parameter of the ``node-set-provision-state`` command,
for example::
@ -2205,8 +2205,7 @@ especially useful when used with `cloud-init
<http://cloudinit.readthedocs.org/en/latest/topics/datasources.html#config-drive>`_,
but in order to use it we should follow some rules:
* ``Cloud-init`` `expects a specific format to the data
<http://docs.openstack.org/user-guide/cli_config_drive.html#configuration-drive-contents>`_.
* ``Cloud-init`` data should be organized in the `expected format`_.
* Since the Bare Metal service uses a disk partition as the configuration drive,
@ -2224,6 +2223,8 @@ but in order to use it we should follow some rules:
For more information see `how to configure cloud-init data sources
<http://docs.openstack.org/developer/diskimage-builder/elements/cloud-init-datasources/README.html>`_.
.. _`expected format`: http://docs.openstack.org/user-guide/cli_config_drive.html#openstack-metadata-format
.. _BuildingDeployRamdisk:
Building or downloading a deploy ramdisk image