Skip to content

Commit 54bb776

Browse files
rupeshtarupeshta
committed
Merge branch 'develop' into at_unit_tests
2 parents fbafd6f + 91b9632 commit 54bb776

File tree

550 files changed

+3886
-2183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

550 files changed

+3886
-2183
lines changed

‎Contributing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ reason to ask first.
5555
Fixing issues
5656
=============
5757

58-
If you wish to help us fixing the issue you're reporting, `Salt's documentation`_ already includes
58+
If you wish to help us fixing the issue you're reporting, `Salt's documentation`_ already includes
5959
information to help you setup a development environment, under `Developing Salt`_.
6060

61-
Fix the issue you have in hands, if possible also add a test case to Salt's testing suite, create a
61+
Fix the issue you have in hands, if possible also add a test case to Salt's testing suite, create a
6262
`pull request`_, and **that's it**!
6363

64-
Salt's development team will review your fix and if everything is OK, your fix will be merged into
64+
Salt's development team will review your fix and if everything is OK, your fix will be merged into
6565
salt's code.
6666

6767

‎_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ msgpack-python > 0.3
33
PyYAML
44
MarkupSafe
55
requests >= 1.0.0
6-
six
6+
six

‎debian/salt-master.upstart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ start on (net-device-up
66
stop on runlevel [!2345]
77
limit nofile 100000 100000
88

9+
env CONFIG_DIR=/etc/salt
10+
911
script
1012
# Read configuration variable file if it is present
1113
[ -f /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB
1214

1315
# Activate the virtualenv if defined
1416
[ -f $SALT_USE_VIRTUALENV/bin/activate ] && . $SALT_USE_VIRTUALENV/bin/activate
1517

16-
exec salt-master
18+
exec salt-master -c $CONFIG_DIR
1719
end script

‎doc/_incl/extend_with_require_watch.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.. admonition:: Using extend with require or watch
22

33
The ``extend`` statement works differently for ``require`` or ``watch``.
4-
It appends to, rather than replacing the requisite component.
4+
It appends to, rather than replacing the requisite component.

‎doc/_incl/requisite_incl.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ following the :doc:`installation </topics/installation/index>` and the
77
There are many ways to :ref:`get help from the Salt community
88
<salt-community>` including our
99
`mailing list <https://groups.google.com/forum/#!forum/salt-users>`_
10-
and our `IRC channel <http://webchat.freenode.net/?channels=salt>`_ #salt.
10+
and our `IRC channel <http://webchat.freenode.net/?channels=salt>`_ #salt.

‎doc/_templates/autosummary.rst.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
{{ underline }}
44

55
.. automodule:: {{ fullname }}
6-
:members:
6+
:members:

‎doc/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ def __getattr__(cls, name):
218218
html_short_title = 'Salt'
219219

220220
html_static_path = ['_static']
221-
html_logo = None # specfied in the theme layout.html
221+
html_logo = None # specified in the theme layout.html
222222
html_favicon = 'favicon.ico'
223223
html_use_smartypants = False
224224

‎doc/contents-1.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ Salt Table of Contents
1515
topics/reactor/index
1616
topics/mine/index
1717
topics/eauth/index
18-
glossary
18+
glossary

‎doc/contents-2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ Salt Table of Contents
1515
topics/netapi/index
1616
topics/virt/index
1717
topics/yaml/index
18-
glossary
18+
glossary

‎doc/contents-3.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ Salt Table of Contents
1616
topics/projects/index
1717
security/index
1818
faq
19-
glossary
19+
glossary

‎doc/contents-4.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ Salt Table of Contents
88
:numbered:
99

1010
ref/index
11-
glossary
11+
glossary

‎doc/contents.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ Salt Table of Contents
3333
topics/projects/index
3434
security/index
3535
faq
36-
glossary
36+
glossary

‎doc/faq.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ or running immediately from the command line:
268268
.. code-block:: bash
269269
270270
salt -G kernel:Windows cmd.run 'start powershell "Restart-Service -Name salt-minion"'
271-
271+
272272
Salting the Salt Master
273273
-----------------------
274274

@@ -291,4 +291,4 @@ master without requiring the minion to be running.
291291
More information about salting the Salt master can be found in the salt-formula
292292
for salt itself:
293293

294-
https://github.com/saltstack-formulas/salt-formula
294+
https://github.com/saltstack-formulas/salt-formula

‎doc/glossary.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Glossary
4545
<all-salt.returners>`.
4646

4747
External Pillar
48-
A module that accepts arbitrary arguments and returns a dictionary.
48+
A module that accepts arbitrary arguments and returns a dictionary.
4949
The dictionary is automatically added to a pillar for a minion.
5050

5151
Event
@@ -258,4 +258,4 @@ Glossary
258258
A function in a module that is called on module load to determine
259259
whether or not the module should be available to a minion. This
260260
function commonly contains logic to determine if all requirements
261-
for a module are available, such as external libraries.
261+
for a module are available, such as external libraries.

‎doc/index.rst

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ Salt source releases are available for download via the following PyPI link:
3737

3838
https://pypi.python.org/pypi/salt
3939

40-
The installation document, found in the following link, outlines where to
40+
The installation document, found in the following link, outlines where to
4141
obtain packages and installation specifics for platforms:
4242

4343
:doc:`Installation </topics/installation/index>`
4444

45-
The Salt Bootstrap project, found in the following repository, is a single
45+
The Salt Bootstrap project, found in the following repository, is a single
4646
shell script, which automates the install correctly on multiple platforms:
4747

4848
https://github.com/saltstack/salt-bootstrap
@@ -55,7 +55,7 @@ foundational knowledge of Salt:
5555

5656
:doc:`Official Salt Walkthrough</topics/tutorials/walkthrough>`
5757

58-
The following getting started tutorials are also available:
58+
The following getting started tutorials are also available:
5959

6060
States - Configuration Management with Salt:
6161
- :doc:`Getting Started with States<topics/tutorials/starting_states>`
@@ -74,7 +74,7 @@ Salt in depth
7474
=============
7575

7676
While setting up, and using, Salt is a simple task, its capabilities run much
77-
deeper. These documents provide a greater understanding of how Salt
77+
deeper. These documents provide a greater understanding of how Salt
7878
empowers infrastructure management.
7979

8080
Remote execution
@@ -97,12 +97,12 @@ modules and returners, which are two key elements of remote execution.
9797

9898
**Returners**
9999
Salt returners allow saving minion responses in various datastores, or
100-
to various locations, in addition to displaying the responses at the CLI.
101-
Returners can be used to extend Salt to communicate with new, or custom,
100+
to various locations, in addition to displaying the responses at the CLI.
101+
Returners can be used to extend Salt to communicate with new, or custom,
102102
interfaces and to support new databases.
103103

104104
:doc:`Full list of returners </ref/returners/all/index>`
105-
Contains: list of returner modules used to store minion responses
105+
Contains: list of returner modules used to store minion responses
106106
in Redis, Mongo, Cassandra, SQL, and others.
107107

108108
:doc:`Writing returners <ref/returners/index>`
@@ -143,9 +143,9 @@ Configuration management
143143
------------------------
144144

145145
Salt contains a robust and flexible configuration management framework, which
146-
is built on the remote execution core. This framework executes on the minions,
146+
is built on the remote execution core. This framework executes on the minions,
147147
allowing effortless, simultaneous configuration of tens of thousands of hosts,
148-
by rendering language specific state files. The following links provide
148+
by rendering language specific state files. The following links provide
149149
resources to learn more about state and renderers.
150150

151151
**States**
@@ -167,24 +167,24 @@ resources to learn more about state and renderers.
167167
configuration format that states represent.
168168

169169
:doc:`Writing states <ref/states/writing>`
170-
Contains: a guide on how to write Salt state modules, easily extending
170+
Contains: a guide on how to write Salt state modules, easily extending
171171
Salt to directly manage more software.
172172

173173
**Renderers**
174174
Renderers use state configuration files written in a variety of languages,
175-
templating engines, or files. Salt's configuration management system is,
175+
templating engines, or files. Salt's configuration management system is,
176176
under the hood, language agnostic.
177177

178178
:doc:`Full list of renderers <ref/renderers/all/index>`
179-
Contains: a list of renderers.
179+
Contains: a list of renderers.
180180
YAML is one choice, but many systems are available, from
181181
alternative templating engines to the PyDSL language for rendering
182182
sls formulas.
183183

184184
:doc:`Renderers <ref/renderers/index>`
185185
Contains: more information about renderers. Salt states are only
186-
concerned with the ultimate highstate data structure, not how the
187-
data structure was created.
186+
concerned with the ultimate highstate data structure, not how the
187+
data structure was created.
188188

189189
Miscellaneous topics
190190
--------------------
@@ -206,7 +206,7 @@ The following links explore various Salt topics in depth.
206206

207207
:doc:`Peer Communication <ref/peer>`
208208
Allow minions to communicate among themselves. For example, configure
209-
one minion by querying live data from all the others.
209+
one minion by querying live data from all the others.
210210

211211
:doc:`Reactor System <topics/reactor/index>`
212212
The reactor system allows for Salt to create a self aware environment
@@ -233,7 +233,7 @@ The following links explore various Salt topics in depth.
233233
unable to run a salt-minion.
234234

235235
:ref:`Python API interface <python-api>`
236-
The Python API allows the developer to use Salt locally from scripts and
236+
The Python API allows the developer to use Salt locally from scripts and
237237
programs easily via ``import salt``.
238238

239239
:ref:`External API interfaces <netapi-introduction>`
@@ -288,4 +288,4 @@ More information about the project
288288
The SaltStack security disclosure policy
289289

290290
.. _`salt-contrib`: https://github.com/saltstack/salt-contrib
291-
.. _`salt-states`: https://github.com/saltstack/salt-states
291+
.. _`salt-states`: https://github.com/saltstack/salt-states

‎doc/man/salt-cloud.1

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ Provision virtual machines in the cloud with Salt
4040
.ft C
4141
salt\-cloud \-m /etc/salt/cloud.map
4242

43+
salt\-cloud \-m /etc/salt/cloud.map NAME
44+
45+
salt\-cloud \-m /etc/salt/cloud.map NAME1 NAME2
46+
4347
salt\-cloud \-p PROFILE NAME
4448

4549
salt\-cloud \-p PROFILE NAME1 NAME2 NAME3 NAME4 NAME5 NAME6
@@ -67,8 +71,9 @@ must be defined in the specified profiles file.
6771
.TP
6872
.B \-m MAP, \-\-map=MAP
6973
Specify a map file to use. If used without any other options, this option
70-
will ensure that all of the mapped VMs are created. If the named VM
71-
already exists then it will be skipped.
74+
will ensure that all of the mapped VMs are created. If VM names are
75+
also passed as arguments, they will be used to filter the map file.
76+
If the named VM already exists then it will be skipped.
7277
.UNINDENT
7378
.INDENT 0.0
7479
.TP

‎doc/ref/auth/all/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ Full list of builtin auth modules
1515
ldap
1616
pam
1717
pki
18-
stormpath_mod
18+
stormpath_mod

‎doc/ref/cli/_includes/common-options.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414

1515
The location of the Salt configuration directory. This directory contains
1616
the configuration files for Salt master and minions. The default location
17-
on most systems is ``/etc/salt``.
17+
on most systems is ``/etc/salt``.

‎doc/ref/cli/_includes/daemon-options.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88

99
.. option:: --pid-file PIDFILE
1010

11-
Specify the location of the pidfile. Default: /var/run/|salt-daemon|.pid
11+
Specify the location of the pidfile. Default: /var/run/|salt-daemon|.pid

‎doc/ref/cli/_includes/extended-target-selection.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
Make sure that the compound target is encapsulated in quotes.
88

99
.. option:: -I, --pillar
10-
10+
1111
Instead of using shell globs to evaluate the target, use a pillar value to
1212
identify targets. The syntax for the target is the pillar key followed by
1313
a glob expression: "role:production*"
1414

1515
.. option:: -S, --ipcidr
1616

17-
Match based on Subnet (CIDR notation) or IPv4 address.
17+
Match based on Subnet (CIDR notation) or IPv4 address.

‎doc/ref/cli/_includes/logging-options.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Logging options which override any settings defined on the configuration files.
66
.. start-console-output
77
.. option:: -l LOG_LEVEL, --log-level=LOG_LEVEL
88

9-
Console logging log level. One of ``all``, ``garbage``, ``trace``,
10-
``debug``, ``info``, ``warning``, ``error``, ``quiet``. Default:
9+
Console logging log level. One of ``all``, ``garbage``, ``trace``,
10+
``debug``, ``info``, ``warning``, ``error``, ``quiet``. Default:
1111
|loglevel|.
1212
.. stop-console-output
1313
@@ -17,6 +17,6 @@ Logging options which override any settings defined on the configuration files.
1717

1818
.. option:: --log-file-level=LOG_LEVEL_LOGFILE
1919

20-
Logfile logging log level. One of ``all``, ``garbage``, ``trace``,
21-
``debug``, ``info``, ``warning``, ``error``, ``quiet``. Default:
22-
|loglevel|.
20+
Logfile logging log level. One of ``all``, ``garbage``, ``trace``,
21+
``debug``, ``info``, ``warning``, ``error``, ``quiet``. Default:
22+
|loglevel|.

‎doc/ref/cli/_includes/output-options.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Output Options
1919
.. note::
2020
If using ``--out=json``, you will probably want ``--static`` as well.
2121
Without the static option, you will get a JSON string for each minion.
22-
This is due to using an iterative outputter. So if you want to feed it
22+
This is due to using an iterative outputter. So if you want to feed it
2323
to a JSON parser, use ``--static`` as well.
2424

2525
.. option:: --out-indent OUTPUT_INDENT, --output-indent OUTPUT_INDENT
@@ -45,4 +45,3 @@ Output Options
4545

4646
``green`` denotes success, ``red`` denotes failure, ``blue`` denotes
4747
changes and success and ``yellow`` denotes a expected future change in configuration.
48-

‎doc/ref/cli/_includes/target-selection.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,3 @@ Target Selection
4040
Using the Range option requires that a range server is set up and the
4141
location of the range server is referenced in the master configuration
4242
file.
43-

‎doc/ref/cli/_includes/timeout-option.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
The timeout in seconds to wait for replies from the Salt minions. The
44
timeout number specifies how long the command line client will wait to
5-
query the minions and check on running jobs. Default: |timeout|
5+
query the minions and check on running jobs. Default: |timeout|

‎doc/ref/cli/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Or to explicitly list hosts, salt can take a list:
5252
More Powerful Targets
5353
---------------------
5454

55-
The simple target specifications, glob, regex and list will cover many use
55+
The simple target specifications, glob, regex, and list will cover many use
5656
cases, and for some will cover all use cases, but more powerful options exist.
5757

5858
Targeting with Grains

‎doc/ref/cli/salt-api.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Synopsis
99

1010
.. code-block:: bash
1111
12-
salt-api
12+
salt-api
1313
1414
Description
1515
===========
@@ -34,4 +34,4 @@ See also
3434

3535
:manpage:`salt-api(7)`
3636
:manpage:`salt(7)`
37-
:manpage:`salt-master(1)`
37+
:manpage:`salt-master(1)`

0 commit comments

Comments
 (0)