From 94a6878e821cca335a0e3745967fac14b1bd2913 Mon Sep 17 00:00:00 2001 From: Jorge Schrauwen Date: Thu, 24 Dec 2015 10:15:16 +0000 Subject: [PATCH 1/2] zpool state header fix --- salt/states/zpool.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/states/zpool.py b/salt/states/zpool.py index a582b4077a..7a9656db09 100644 --- a/salt/states/zpool.py +++ b/salt/states/zpool.py @@ -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 From 14ec8ccd35dcc0360780904abef734093c649b21 Mon Sep 17 00:00:00 2001 From: Jorge Schrauwen Date: Thu, 24 Dec 2015 10:16:02 +0000 Subject: [PATCH 2/2] split long note into note and warning for clarity --- salt/states/zpool.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/states/zpool.py b/salt/states/zpool.py index 7a9656db09..f79a4ad3e6 100644 --- a/salt/states/zpool.py +++ b/salt/states/zpool.py @@ -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