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

lxc: saltify -> bootstrap; lxc & seed: doc improvements

Browse Source
This commit is contained in:
Matthew Williams 2014-03-09 22:16:44 -04:00
parent fd929044f1
commit ee70eed662
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/modules/lxc.py
View File

@ -1011,14 +1011,14 @@ def set_dns(name, dnsservers=None, searchdomains=None):
return ret
def saltify(name, config=None, approve_key=True, install=True):
def bootstrap(name, config=None, approve_key=True, install=True):
'''
Install and configure salt in a container.
.. code-block:: bash
salt 'minion' lxc.saltify name [config=config_data] \\
[approve_key=(true|false)] [approve_key=(true|false)]
salt 'minion' lxc.bootstrap name [config=config_data] \\
[approve_key=(true|false)] [install=(true|false)]
config
Minion configuration options. By default, the 'master' option is set to

4
salt/modules/seed.py
View File

@ -84,7 +84,9 @@ def apply_(path, id_=None, config=None, approve_key=True, install=True,
Install salt-minion, if absent. Default: true.
prep_install
Prepare the bootstrap script, but don't run it. Default: false
Prepare the bootstrap script, but don't run it. The files needed for
instllation (bootstrap.py, config, and keys) will be placed in /tmp
on the target path/device. Default: false
'''
stats = __salt__['file.stats'](path, follow_symlinks=True)
if not stats: