mirror of
https://github.com/kevingruesser/bootstrap-vz.git
synced 2025-08-22 09:50:37 +00:00
Docs: fix wrongfully escaped terms
This commit is contained in:
parent
c6087f398d
commit
e409115b25
12 changed files with 36 additions and 36 deletions
|
@ -9,4 +9,4 @@ username specified.
|
|||
Settings
|
||||
~~~~~~~~
|
||||
|
||||
- ``username``: The username of the account to create. *``required``*
|
||||
- ``username``: The username of the account to create. ``required``
|
||||
|
|
|
@ -11,17 +11,17 @@ Settings
|
|||
~~~~~~~~
|
||||
|
||||
- ``address``: The IP or host of the proxy server.
|
||||
*``required``*
|
||||
``required``
|
||||
- ``port``: The port (integer) of the proxy server.
|
||||
*``required``*
|
||||
``required``
|
||||
- ``username``: The username for authentication against the proxy server.
|
||||
This is ignored if ``password`` is not also set.
|
||||
*``optional``*
|
||||
``optional``
|
||||
- ``password``: The password for authentication against the proxy server.
|
||||
This is ignored if ``username`` is not also set.
|
||||
*``optional``*
|
||||
``optional``
|
||||
- ``persistent``: Whether the proxy configuration file should remain on
|
||||
the machine or not.
|
||||
Valid values: true, false
|
||||
Default: ``false``
|
||||
*``optional``*
|
||||
``optional``
|
||||
|
|
|
@ -12,12 +12,12 @@ Settings
|
|||
~~~~~~~~
|
||||
|
||||
- ``username``: The username of the account to create.
|
||||
*``required``*
|
||||
``required``
|
||||
- ``disable_modules``: A list of strings specifying which cloud-init
|
||||
modules should be disabled.
|
||||
*``optional``*
|
||||
``optional``
|
||||
- ``metadata_sources``: A string that sets the
|
||||
`datasources <http://cloudinit.readthedocs.org/en/latest/topics/datasources.html>`__
|
||||
that cloud-init should try fetching metadata from. The source is
|
||||
automatically set when using the ec2 provider.
|
||||
*``optional``*
|
||||
``optional``
|
||||
|
|
|
@ -15,4 +15,4 @@ Settings
|
|||
- ``version``: Selects the docker version to install. To select the
|
||||
latest version simply omit this setting.
|
||||
Default: ``latest``
|
||||
*``optional``*
|
||||
``optional``
|
||||
|
|
|
@ -15,5 +15,5 @@ Settings
|
|||
(to circumvent this, simply put the entire command in a single
|
||||
string). In addition to the manifest variables ``{root}`` is also
|
||||
available. It points at the root of the image volume.
|
||||
*``required``*
|
||||
*``manifest vars``*
|
||||
``required``
|
||||
``manifest vars``
|
||||
|
|
|
@ -29,9 +29,9 @@ Settings
|
|||
zeroes, so the volume could be better shrunk after this.
|
||||
Valid values: true, false
|
||||
Default: false
|
||||
*``optional``*
|
||||
``optional``
|
||||
- ``shrink``: Whether the volume should be shrunk. This setting works
|
||||
best in conjunction with the zerofree tool.
|
||||
Valid values: true, false
|
||||
Default: false
|
||||
*``optional``*
|
||||
``optional``
|
||||
|
|
|
@ -9,4 +9,4 @@ Settings
|
|||
|
||||
- ``servers``: A list of strings specifying which servers should be
|
||||
used to synchronize the machine clock.
|
||||
*``optional``*
|
||||
``optional``
|
||||
|
|
|
@ -16,9 +16,9 @@ Settings
|
|||
~~~~~~~~
|
||||
|
||||
- ``manifest``: Path to the puppet manifest that should be applied.
|
||||
*``optional``*
|
||||
``optional``
|
||||
- ``assets``: Path to puppet assets. The contents will be copied into
|
||||
``/etc/puppet`` on the image. Any existing files will be overwritten.
|
||||
*``optional``*
|
||||
``optional``
|
||||
- ``enable_agent``: Whether the puppet agent daemon should be enabled.
|
||||
*``optional``*
|
||||
``optional``
|
||||
|
|
|
@ -8,4 +8,4 @@ Settings
|
|||
~~~~~~~~
|
||||
|
||||
- ``password``: The password for the root user.
|
||||
*``required``*
|
||||
``required``
|
||||
|
|
|
@ -11,16 +11,16 @@ Settings
|
|||
- ``install_source``: Source to install salt codebase from. ``stable``
|
||||
for current stable, ``daily`` for installing the daily build, and
|
||||
``git`` to install from git repository.
|
||||
*``required``*
|
||||
``required``
|
||||
- ``version``: Only needed if you are installing from ``git``.
|
||||
\ ``develop`` to install current development head, or provide any tag
|
||||
name or commit hash from `salt
|
||||
repo <https://github.com/saltstack/salt>`__
|
||||
*``optional``*
|
||||
``optional``
|
||||
- ``master``: Salt master FQDN or IP
|
||||
*``optional``*
|
||||
``optional``
|
||||
- ``grains``: Set `salt
|
||||
grains <http://docs.saltstack.com/en/latest/topics/targeting/grains.html>`__
|
||||
for this minion. Accepts a map with grain name as key and the grain
|
||||
data as value.
|
||||
*``optional``*
|
||||
``optional``
|
||||
|
|
|
@ -10,9 +10,9 @@ Settings
|
|||
~~~~~~~~
|
||||
|
||||
- ``update_interval``: Days between running ``apt-get update``.
|
||||
*``required``*
|
||||
``required``
|
||||
- ``download_interval``: Days between running
|
||||
``apt-get upgrade --download-only``
|
||||
*``required``*
|
||||
``required``
|
||||
- ``upgrade_interval``: Days between installing any security upgrades.
|
||||
*``required``*
|
||||
``required``
|
||||
|
|
|
@ -24,28 +24,28 @@ and secret key, which are needed for bootstraping EBS backed instances.
|
|||
The settings describes below should be placed in the ``credentials`` key
|
||||
under the ``provider`` section.
|
||||
|
||||
- **``access-key``**: AWS access-key.
|
||||
- ``access-key``: AWS access-key.
|
||||
May also be supplied via the environment variable
|
||||
``$AWS_ACCESS_KEY``
|
||||
*``required for EBS & S3 backing``*
|
||||
- **``secret-key``**: AWS secret-key.
|
||||
``required for EBS & S3 backing``
|
||||
- ``secret-key``: AWS secret-key.
|
||||
May also be supplied via the environment variable
|
||||
``$AWS_SECRET_KEY``
|
||||
*``required for EBS & S3 backing``*
|
||||
- **``certificate``**: Path to the AWS user certificate. Used for
|
||||
``required for EBS & S3 backing``
|
||||
- ``certificate``: Path to the AWS user certificate. Used for
|
||||
uploading the image to an S3 bucket.
|
||||
May also be supplied via the environment variable
|
||||
``$AWS_CERTIFICATE``
|
||||
*``required for S3 backing``*
|
||||
- **``private-key``**: Path to the AWS private key. Used for uploading
|
||||
``required for S3 backing``
|
||||
- ``private-key``: Path to the AWS private key. Used for uploading
|
||||
the image to an S3 bucket.
|
||||
May also be supplied via the environment variable
|
||||
``$AWS_PRIVATE_KEY``
|
||||
*``required for S3 backing``*
|
||||
- **``user-id``**: AWS user ID. Used for uploading the image to an S3
|
||||
``required for S3 backing``
|
||||
- ``user-id``: AWS user ID. Used for uploading the image to an S3
|
||||
bucket.
|
||||
May also be supplied via the environment variable ``$AWS_USER_ID``
|
||||
*``required for S3 backing``*
|
||||
``required for S3 backing``
|
||||
|
||||
Example:
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue