Commit bd25ea1a authored by Nikos Skalkotos's avatar Nikos Skalkotos
Browse files

docs: Reflect the changes made in the hotfix

* Remove obsolete parts from the /etc/default/snf-image sample file
  shown in the configuration section.
* Update the documentation about having made the img_passwd an
  optional parameter.
parent dbdad4b0
...@@ -235,7 +235,8 @@ only environment variable required is *SNF_IMAGE_TARGET*. ...@@ -235,7 +235,8 @@ only environment variable required is *SNF_IMAGE_TARGET*.
| | | | |HOSTNAME |PROPERTY_OSFAMILY | | | | | |HOSTNAME |PROPERTY_OSFAMILY |
+-------------------------------+---+------------------+-------------------------+-------------------------+------------------------+ +-------------------------------+---+------------------+-------------------------+-------------------------+------------------------+
|ChangePassword |50 |InstallUnattend |EnforcePersonality |TARGET |PROPERTY_USERS | |ChangePassword |50 |InstallUnattend |EnforcePersonality |TARGET |PROPERTY_USERS |
| | | | |PASSWORD |PROPERTY_OSFAMILY | | | | | | |PROPERTY_OSFAMILY |
| | | | | |PASSWORD |
+-------------------------------+---+------------------+-------------------------+-------------------------+------------------------+ +-------------------------------+---+------------------+-------------------------+-------------------------+------------------------+
|FilesystemResizeMounted |50 |InstallUnattend |EnforcePersonality |TARGET |PROPERTY_OSFAMILY | |FilesystemResizeMounted |50 |InstallUnattend |EnforcePersonality |TARGET |PROPERTY_OSFAMILY |
+-------------------------------+---+------------------+-------------------------+-------------------------+------------------------+ +-------------------------------+---+------------------+-------------------------+-------------------------+------------------------+
......
...@@ -9,12 +9,6 @@ some external programs in ``/etc/default/snf-image``: ...@@ -9,12 +9,6 @@ some external programs in ``/etc/default/snf-image``:
# snf-image defaults file # snf-image defaults file
# IMAGE_NAME: Name of the image to use
# Generally you use the name of the image with the version of the OS included.
# Examples include:
# centos-5.4 debian-4.0 fedora-12
# IMAGE_NAME=""
# IMAGE_DIR: directory location for disk images # IMAGE_DIR: directory location for disk images
# IMAGE_DIR="/var/lib/snf-image" # IMAGE_DIR="/var/lib/snf-image"
......
...@@ -11,8 +11,8 @@ following OS Parameters: ...@@ -11,8 +11,8 @@ following OS Parameters:
(:ref:`details <image-format>`) (:ref:`details <image-format>`)
* **img_id** (required if *config_url* is missing): the URI used to identify * **img_id** (required if *config_url* is missing): the URI used to identify
the image (:ref:`details <image-id>`) the image (:ref:`details <image-id>`)
* **img_passwd** (required if *config_url* is missing): the password to be * **img_passwd** (optional): the password to be injected into the image
injected to the image (:ref:`details <image-passwd>`)
* **img_properties** (optional): additional image properties used to customize * **img_properties** (optional): additional image properties used to customize
the image (:ref:`details <image-properties>`) the image (:ref:`details <image-properties>`)
* **img_personality** (optional): files to be injected into the image's file * **img_personality** (optional): files to be injected into the image's file
...@@ -33,7 +33,7 @@ snf-image supports 3 different types of image formats: ...@@ -33,7 +33,7 @@ snf-image supports 3 different types of image formats:
These are also the only valid values for the **img_format** OS parameter. These are also the only valid values for the **img_format** OS parameter.
The **diskdump** type is the newest and recommended type. Thus, all sample The **diskdump** type is the newest and recommended type. Thus, all sample
images we provide are of this type. For more details about the internals of images we provide are of this type. For more details about the internals of
image formats please see the :ref:`corresponding advanced section image formats please see the corresponding :ref:`advanced section
<image-format-advanced>`. <image-format-advanced>`.
.. _image-id: .. _image-id:
...@@ -83,6 +83,15 @@ to be used. If no prefix is used, it defaults to the local back-end: ...@@ -83,6 +83,15 @@ to be used. If no prefix is used, it defaults to the local back-end:
To select the Null back-end and skip the fetching and extraction step, we set To select the Null back-end and skip the fetching and extraction step, we set
``img_id=null``. ``img_id=null``.
.. _image-passwd:
Image Password (img_passwd)
^^^^^^^^^^^^^^^^^^^^^^^^^^^
The value of this parameter is the password to be injected into the image. If
this parameter is not set at all, then the *ChangePassword* task (see
:ref:`Image Configuration Tasks <image-configuration-tasks>`) will not run.
.. _image-properties: .. _image-properties:
Image Properties (img_properties) Image Properties (img_properties)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment