valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #29026 from jacobhammons/develop

Browse Source 
doc for salt.states.smartos
This commit is contained in:
jacobhammons 2015-11-18 18:03:15 -07:00
commit 296a5708cc
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/ref/states/all/salt.states.smartos.rst Normal file
View File

@ -0,0 +1,6 @@
===================
salt.states.smartos
===================
.. automodule:: salt.states.smartos
:members:

16
salt/states/smartos.py
View File

@ -74,12 +74,13 @@ Management of SmartOS Standalone Compute Nodes
cleanup_images: cleanup_images:
smartos.image_vacuum smartos.image_vacuum
.. note:: .. note::
Keep in mind that when removing entries from vmconfig they will not get removed from the vm's current configuration,
for nics, disk, tags, ... they get removed as via add_*, set_*, update_*, and remove_*. Other properties must be
manual reset to there default value just like when using vmadm update.
Keep in mind that when removing entries from vmconfig they will not get
removed from the vm's current configuration, for nics, disk, tags, ... they
get removed as via add_*, set_*, update_*, and remove_*. Other properties
must be manually reset to their default value just like when using vmadm
update.
''' '''
from __future__ import absolute_import from __future__ import absolute_import
@ -322,9 +323,8 @@ def image_absent(name):
.. note:: .. note::
computenode.image_absent will only remove the image if computenode.image_absent will only remove the image if it is not used
it is not used by a vm. by a vm.
''' '''
ret = {'name': name, ret = {'name': name,
'changes': {}, 'changes': {},