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

Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2

Browse Source
This commit is contained in:
Colton Myers 2015-04-16 10:37:38 -06:00
commit 8d9874a78a
14 changed files with 3929 additions and 25869 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
doc/man/salt-call.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CALL" "1" "March 09, 2015" "2015.2.0rc1-133-g24fa806" "Salt"
.TH "SALT-CALL" "1" "April 14, 2015" "2014.7.4-180-gc0d1bdd" "Salt"
.SH NAME
salt-call \- salt-call Documentation
.
@ -70,14 +70,19 @@ on most systems is \fB/etc/salt\fP\&.
.UNINDENT
.INDENT 0.0
.TP
.B \-\-hard\-crash
Raise any original exception rather than exiting gracefully Default: False
.UNINDENT
.INDENT 0.0
.TP
.B \-g, \-\-grains
Return the information generated by the Salt grains
.UNINDENT
.INDENT 0.0
.TP
.B \-m MODULE_DIRS, \-\-module\-dirs=MODULE_DIRS
Specify an additional directories to pull modules from, multiple
directories can be delimited by commas
Specify an additional directory to pull modules from. Multiple directories
can be provided by passing \-m /\-\-module\-dirs multiple times.
.UNINDENT
.INDENT 0.0
.TP
@ -105,6 +110,43 @@ returners.
.B \-\-local
Run salt\-call locally, as if there was no master running.
.UNINDENT
.INDENT 0.0
.TP
.B \-\-file\-root=FILE_ROOT
Set this directory as the base file root.
.UNINDENT
.INDENT 0.0
.TP
.B \-\-pillar\-root=PILLAR_ROOT
Set this directory as the base pillar root.
.UNINDENT
.INDENT 0.0
.TP
.B \-\-retcode\-passthrough
Exit with the salt call retcode and not the salt binary retcode
.UNINDENT
.INDENT 0.0
.TP
.B \-\-metadata
Print out the execution metadata as well as the return. This will print out
the outputter data, the return code, etc.
.UNINDENT
.INDENT 0.0
.TP
.B \-\-id=ID
Specify the minion id to use. If this option is omitted, the id option from
the minion config will be used.
.UNINDENT
.INDENT 0.0
.TP
.B \-\-skip\-grains
Do not load grains.
.UNINDENT
.INDENT 0.0
.TP
.B \-\-refresh\-grains\-cache
Force a refresh of the grains cache
.UNINDENT
.SS Logging Options
.sp
Logging options which override any settings defined on the configuration files.

29498
doc/man/salt.7
View File

File diff suppressed because it is too large Load Diff

14
doc/ref/cli/salt-api.rst
View File

@ -21,13 +21,19 @@ Options
.. program:: salt-api
.. option:: -h, --help
.. include:: _includes/common-options.rst
Print a usage message briefly summarizing these command-line options.
.. option:: -d, --daemon
.. option:: -C CONFIG, --config=CONFIG
Run the salt-api as a daemon
Specify an alternative location for the salt master configuration file.
.. option:: --pid-file=PIDFILE
Specify the location of the pidfile. Default: /var/run/salt-api.pid
.. include:: _includes/logging-options.rst
.. |logfile| replace:: /var/log/salt/api
.. |loglevel| replace:: ``warning``
See also
========

38
doc/ref/cli/salt-call.rst
View File

@ -22,14 +22,18 @@ Options
.. include:: _includes/common-options.rst
.. option:: --hard-crash
Raise any original exception rather than exiting gracefully Default: False
.. option:: -g, --grains
Return the information generated by the Salt grains
.. option:: -m MODULE_DIRS, --module-dirs=MODULE_DIRS
Specify an additional directories to pull modules from, multiple
directories can be delimited by commas
Specify an additional directory to pull modules from. Multiple directories
can be provided by passing -m /--module-dirs multiple times.
.. option:: -d, --doc, --documentation
@ -53,6 +57,36 @@ Options
Run salt-call locally, as if there was no master running.
.. option:: --file-root=FILE_ROOT
Set this directory as the base file root.
.. option:: --pillar-root=PILLAR_ROOT
Set this directory as the base pillar root.
.. option:: --retcode-passthrough
Exit with the salt call retcode and not the salt binary retcode
.. option:: --metadata
Print out the execution metadata as well as the return. This will print out
the outputter data, the return code, etc.
.. option:: --id=ID
Specify the minion id to use. If this option is omitted, the id option from
the minion config will be used.
.. option:: --skip-grains
Do not load grains.
.. option:: --refresh-grains-cache
Force a refresh of the grains cache
.. include:: _includes/logging-options.rst
.. |logfile| replace:: /var/log/salt/minion
.. |loglevel| replace:: ``info``

116
doc/ref/cli/salt-cloud.rst
View File

@ -30,21 +30,36 @@ Options
.. program:: salt-cloud
.. option:: -h, --help
.. include:: _includes/common-options.rst
Print a usage message briefly summarizing these command-line options.
Execution Options
-----------------
.. option:: -L LOCATION, --location=LOCATION
Specify which region to connect to.
.. option:: -a ACTION, --action=ACTION
Perform an action that may be specific to this cloud provider. This
argument requires one or more instance names to be specified.
.. option:: -f <FUNC-NAME> <PROVIDER>, --function=<FUNC-NAME> <PROVIDER>
Perform an function that may be specific to this cloud provider, that does
not apply to an instance. This argument requires a provider to be specified
(i.e.: nova).
.. option:: -p PROFILE, --profile=PROFILE
Select a single profile to build the named cloud VMs from. The profile
must be defined in the specified profiles file.
Select a single profile to build the named cloud VMs from. The profile must
be defined in the specified profiles file.
.. option:: -m MAP, --map=MAP
Specify a map file to use. If used without any other options, this option
will ensure that all of the mapped VMs are created. If VM names are
also passed as arguments, they will be used to filter the map file.
If the named VM already exists then it will be skipped.
will ensure that all of the mapped VMs are created. If the named VM already
exists then it will be skipped.
.. option:: -H, --hard
@ -77,6 +92,34 @@ Options
Execute a query and print out information about all cloud VMs. Can be used
in conjunction with -m to display only information about the specified map.
.. option:: -u, --update-bootstrap
Update salt-bootstrap to the latest develop version on GitHub.
.. option:: -y, --assume-yes
Default yes in answer to all confirmation questions.
.. option:: -k, --keep-tmp
Do not remove files from /tmp/ after deploy.sh finishes.
.. option:: --show-deploy-args
Include the options used to deploy the minion in the data returned.
.. option:: --script-args=SCRIPT_ARGS
Script arguments to be fed to the bootstrap script when deploying the VM.
Query Options
-------------
.. option:: -Q, --query
Execute a query and return some information about the nodes running on
configured cloud providers
.. option:: -F, --full-query
Execute a query and print out all available information about all cloud VMs.
@ -101,50 +144,39 @@ Options
the provider's associated profiles, such as ``digital_ocean``, or pass in
``all`` to list all the configured profiles.
.. option:: --list-images
Display a list of images available in configured cloud providers.
Pass the cloud provider that available images are desired on, aka
"linode", or pass "all" to list images for all configured cloud providers.
Cloud Providers Listings
------------------------
.. option:: --list-sizes
.. option:: --list-locations=LIST_LOCATIONS
Display a list of locations available in configured cloud providers. Pass
the cloud provider that available locations are desired on, aka "linode",
or pass "all" to list locations for all configured cloud providers
.. option:: --list-images=LIST_IMAGES
Display a list of images available in configured cloud providers. Pass the
cloud provider that available images are desired on, aka "linode", or pass
"all" to list images for all configured cloud providers
.. option:: --list-sizes=LIST_SIZES
Display a list of sizes available in configured cloud providers. Pass the
cloud provider that available sizes are desired on, aka "aws", or pass
cloud provider that available sizes are desired on, aka "AWS", or pass
"all" to list sizes for all configured cloud providers
.. option:: -C CLOUD_CONFIG, --cloud-config=CLOUD_CONFIG
Cloud Credentials
-----------------
Specify an alternative location for the salt cloud configuration file.
Default location is /etc/salt/cloud.
.. option:: --set-password=<USERNAME> <PROVIDER>
.. option:: -M MASTER_CONFIG, --master-config=MASTER_CONFIG
Configure password for a cloud provider and save it to the keyring.
PROVIDER can be specified with or without a driver, for example:
"--set-password bob rackspace" or more specific "--set-password bob
rackspace:openstack" DEPRECATED!
Specify an alternative location for the salt master configuration file.
The salt master configuration file is used to determine how to handle the
minion RSA keys. Default location is /etc/salt/master.
.. option:: -V VM_CONFIG, --profiles=VM_CONFIG, --vm_config=VM_CONFIG
Specify an alternative location for the salt cloud profiles file.
Default location is /etc/salt/cloud.profiles.
.. option:: --raw-out
Print the output from the salt command in raw python
form, this is suitable for re-reading the output into
an executing python script with eval.
.. option:: --out=OUTPUT, --output=OUTPUT
Print the output from the salt-cloud command using the specified outputter. The
builtins are 'raw', 'compact', 'no_return', 'grains', 'overstatestage', 'pprint',
'json', 'nested', 'yaml', 'highstate', 'quiet', 'key', 'txt', 'newline_values_only',
'virt_query'.
.. option:: --no-color
Disable all colored output.
.. include:: _includes/output-options.rst
Examples

38
doc/ref/cli/salt-key.rst
View File

@ -22,6 +22,15 @@ Options
.. include:: _includes/common-options.rst
.. option:: -u USER, --user=USER
Specify user to run salt-key
.. option:: --hard-crash
Raise any original exception rather than exiting gracefully. Default is
False.
.. option:: -q, --quiet
Suppress output
@ -30,6 +39,12 @@ Options
Answer 'Yes' to all questions presented, defaults to False
.. option:: --rotate-aes-key=ROTATE_AES_KEY
Setting this to False prevents the master from refreshing the key session
when keys are deleted or rejected, this lowers the security of the key
deletion/rejection operation. Default is True.
.. include:: _includes/logging-options.rst
:end-before: start-console-output
.. include:: _includes/logging-options.rst
@ -119,6 +134,29 @@ Key Generation Options
higher, otherwise it will be rounded up to 2048. The
default is 2048.
.. option:: --gen-signature
Create a signature file of the masters public-key named
master_pubkey_signature. The signature can be send to a minion in the
masters auth-reply and enables the minion to verify the masters public-key
cryptographically. This requires a new signing-key- pair which can be
auto-created with the --auto-create parameter.
.. option:: --priv=PRIV
The private-key file to create a signature with
.. option:: --signature-path=SIGNATURE_PATH
The path where the signature file should be written
.. option:: --pub=PUB
The public-key file to create a signature for
.. option:: --auto-create
Auto-create a signing key-pair if it does not yet exist
See also
========

5
doc/ref/cli/salt-run.rst
View File

@ -28,6 +28,11 @@ Options
.. include:: _includes/timeout-option.rst
.. |timeout| replace:: 1
.. option:: --hard-crash
Raise any original exception rather than exiting gracefully. Default is
False.
.. option:: -d, --doc, --documentation
Display documentation for runners, pass a module or a runner to see

4
pkg/windows/buildenv/salt-call.bat
View File

@ -3,7 +3,7 @@
:: Accepts all parameters that Salt-Minion Accepts
:: Define Variables
Set Python="%cd%\bin\python.exe"
Set Script="%cd%\bin\Scripts\salt-call"
Set Python="%~dp0\bin\python.exe"
Set Script="%~dp0\bin\Scripts\salt-call"
"%Python%" "%Script%" %*

4
pkg/windows/buildenv/salt-cp.bat
View File

@ -3,7 +3,7 @@
:: Accepts all parameters that Salt-Minion Accepts
:: Define Variables
Set Python="%cd%\bin\python.exe"
Set Script="%cd%\bin\Scripts\salt-cp"
Set Python="%~dp0\bin\python.exe"
Set Script="%~dp0\bin\Scripts\salt-cp"
"%Python%" "%Script%" %*

11
pkg/windows/buildenv/salt-minion-debug.bat
View File

@ -1,2 +1,11 @@
@ echo off
:: Script for starting the Salt-Minion
:: Accepts all parameters that Salt-Minion Accepts
:: Define Variables
Set Python="%~dp0\bin\python.exe"
Set Script="%~dp0\bin\Scripts\salt-minion"
net stop salt-minion
.\bin\python.exe .\bin\Scripts\salt-minion -l debug -c C:\salt\conf
"%Python%" "%Script%" -l debug

4
pkg/windows/buildenv/salt-minion.bat
View File

@ -3,7 +3,7 @@
:: Accepts all parameters that Salt-Minion Accepts
:: Define Variables
Set Python="%cd%\bin\python.exe"
Set Script="%cd%\bin\Scripts\salt-minion"
Set Python="%~dp0\bin\python.exe"
Set Script="%~dp0\bin\Scripts\salt-minion"
"%Python%" "%Script%" %*

4
pkg/windows/buildenv/salt-unity.bat
View File

@ -3,7 +3,7 @@
:: Accepts all parameters that Salt-Minion Accepts
:: Define Variables
Set Python="%cd%\bin\python.exe"
Set Script="%cd%\bin\Scripts\salt-unity"
Set Python="%~dp0\bin\python.exe"
Set Script="%~dp0\bin\Scripts\salt-unity"
"%Python%" "%Script%" %*

2
salt/master.py
View File

@ -1620,7 +1620,7 @@ class ClearFuncs(object):
elif os.path.isfile(pubfn):
# The key has been accepted, check it
if salt.utils.fopen(pubfn, 'r').read() != load['pub']:
if salt.utils.fopen(pubfn, 'r').read().strip() != load['pub'].strip():
log.error(
'Authentication attempt from {id} failed, the public '
'keys did not match. This may be an attempt to compromise '

12
salt/modules/win_pkg.py
View File

@ -17,7 +17,6 @@ except ImportError:
HAS_DEPENDENCIES = False
# Import python libs
import copy
import logging
try:
import msgpack
@ -227,14 +226,6 @@ def list_pkgs(versions_as_list=False, **kwargs):
for x in ('removed', 'purge_desired')]):
return {}
if 'pkg.list_pkgs' in __context__:
if versions_as_list:
return __context__['pkg.list_pkgs']
else:
ret = copy.deepcopy(__context__['pkg.list_pkgs'])
__salt__['pkg_resource.stringify'](ret)
return ret
ret = {}
name_map = _get_name_map()
with salt.utils.winapi.Com():
@ -248,7 +239,6 @@ def list_pkgs(versions_as_list=False, **kwargs):
__salt__['pkg_resource.add_pkg'](ret, key, val)
__salt__['pkg_resource.sort_pkglist'](ret)
__context__['pkg.list_pkgs'] = copy.deepcopy(ret)
if not versions_as_list:
__salt__['pkg_resource.stringify'](ret)
return ret
@ -564,7 +554,6 @@ def install(name=None, refresh=False, pkgs=None, saltenv='base', **kwargs):
__salt__['cmd.run'](cmd, output_loglevel='trace', python_shell=False)
__context__.pop('pkg.list_pkgs', None)
new = list_pkgs()
return salt.utils.compare_dicts(old, new)
@ -668,7 +657,6 @@ def remove(name=None, pkgs=None, version=None, extra_uninstall_flags=None, **kwa
__salt__['cmd.run'](cmd, output_loglevel='trace', python_shell=False)
__context__.pop('pkg.list_pkgs', None)
new = list_pkgs()
return salt.utils.compare_dicts(old, new)