Merge pull request #29997 from sjorge/doc-fixes

small doc fix for salt.states.zpool
This commit is contained in:
Mike Place 2015-12-28 08:33:17 -07:00
commit 8391277ea1

View File

@ -30,12 +30,12 @@ Management zpool
/dev/disk2
/dev/disk3
.. note::
.. warning::
The layout will never be updated, it will only be used at time of creation.
It's a whole lot of work to figure out if a devices needs to be detached, removed, ... this is best done by the sysadmin on a case per case basis.
The layout will never be updated, it will only be used at time of creation.
It's a whole lot of work to figure out if a devices needs to be detached, removed, ... this is best done by the sysadmin on a case per case basis.
Filesystem properties are also not updated, this should be managed by the zfs state module.
Filesystem properties are also not updated, this should be managed by the zfs state module.
'''
from __future__ import absolute_import
@ -128,6 +128,8 @@ def present(name, properties=None, filesystem_properties=None, layout=None, conf
zpool create mypool mirror /tmp/vdisk3 /tmp/vdisk2 mirror /tmp/vdisk0 /tmp/vdisk1
.. warning::
Pay attention to the order of your dict!
.. code-block:: yaml