8000 Merge branch '0.9.7' · linuxadmin/salt@1d1ab88 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1d1ab88

Browse files
thatch45thatch45
committed
Merge branch '0.9.7'
2 parents c21a932 + 5450585 commit 1d1ab88

File tree

133 files changed

+5534
-2363
lines changed

Some content is hidden

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

133 files changed

+5534
-2363
lines changed

‎conf/master.template

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@
3131
# Set the number of hours to keep old job information
3232
#keep_jobs: 24
3333

34+
# Set the default timeout for the salt command and api, the default is 5
35+
# seconds
36+
#timeout: 5
37+
3438
# Set the directory used to hold unix sockets
3539
#sock_dir: /tmp/salt-unix
3640

3741
# Set the acceptance level for serialization of messages. This should only be
38-
# set if the master is newer that 0.9.5 and the minion are older, this option
42+
# set if the master is newer than 0.9.5 and the minion are older. This option
3943
# allows a 0.9.5 and newer master to communicate with minions 0.9.4 and
4044
# earlier. It is not recommended to keep this setting on if the minions are
4145
# all 0.9.5 or higher, as leaving pickle as the serialization medium is slow
@@ -59,9 +63,15 @@
5963
##########################################
6064
# The state system uses a "top" file to tell the minions what environment to
6165
# use and what modules to use. The state_top file is defined relative to the
62-
# root of the base environment
66+
# root of the base environment.
6367
#state_top: top.sls
6468
#
69+
# The external_nodes option allows Salt to gather data that would normally be
70+
# placed in a top file. The external_nodes option is the executable that will
71+
# return the ENC data. Remember that Salt will look for external nodes AND top
72+
# files and combine the results if both are enabled!
73+
#external_nodes: None
74+
#
6575
# The renderer to use on the minions to render the state data
6676
#renderer: yaml_jinja
6777
#
@@ -78,7 +88,7 @@
7888
# The file server works on environments passed to the master, each environment
7989
# can have multiple root directories, the subdirectories in the multiple file
8090
# roots cannot match, otherwise the downloaded files will not be able to be
81-
# reliably ensured. A base environment is required to house the top file
91+
# reliably ensured. A base environment is required to house the top file.
8292
# Example:
8393
# file_roots:
8494
# base:
@@ -110,15 +120,14 @@
110120
# syndic servers(s) below it set the "order_masters" setting to True, if this
111121
# is a master that will be running a syndic daemon for passthrough the
112122
# "syndic_master" setting needs to be set to the location of the master server
113-
# to recieve commands from
123+
# to recieve commands from.
114124
#
115125
# Set the order_masters setting to True if this master will command lower
116-
# masters' syndic interfaces
126+
# masters' syndic interfaces.
117127
#order_masters: False
118128
#
119-
# If this master will be running a salt syndic daemon, then the syndic needs
120-
# to know where the master it is recieving commands from is, set it with the
121-
# syndic_master value
129+
# If this master will be running a salt syndic daemon, syndic_master tells
130+
# this master where to recieve commands from.
122131
#syndic_master: masterofmaster
123132

124133
##### Peer Publish settings #####
@@ -129,9 +138,9 @@
129138
# compartmentalization of commands based on individual minions.
130139
#
131140
# The configuration uses regular expressions to match minions and then a list
132-
# of regular expressions to match functions, the following will allow the
141+
# of regular expressions to match functions. The following will allow the
133142
# minion authenticated as foo.example.com to execute functions from the test
134-
# and pkg modules
143+
# and pkg modules.
135144
# peer:
136145
# foo.example.com:
137146
# - test.*
@@ -149,7 +158,7 @@
149158
##########################################
150159
# Salt supports automatic clustering, salt creates a single ip address which
151160
# is shared among the individual salt components using ucarp. The private key
152-
# and all of the minion keys are maintained across the defined cluster masters
161+
# and all of the minion keys are maintained across the defined cluster masters.
153162
# The failover service is automatically managed via these settings
154163

155164
# List the identifiers for the other cluster masters in this manner:
@@ -168,14 +177,15 @@
168177
##########################################
169178
# The location of the master log file
170179
#log_file: /var/log/salt/master
180+
#
171181
# The level of messages to send to the log file.
172182
# One of 'info', 'quiet', 'critical', 'error', 'debug', 'warning'.
173183
# Default: 'warning'
174184
#log_level: warning
175185
#
176186
# Logger levels can be used to tweak specific loggers logging levels.
177-
# Imagine you want to have the salt library at the 'warning' level, but, you
178-
# still wish to have 'salt.modules' at the 'debug' level:
187+
# For example, if you want to have the salt library at the 'warning' level,
188+
# but you still wish to have 'salt.modules' at the 'debug' level:
179189
# log_granular_levels:
180190
# 'salt': 'warning',
181191
# 'salt.modules': 'debug'

‎conf/minion.template

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
##### Primary configuration settings #####
33
##########################################
44
# Set the location of the salt master server, if the master server cannot be
5-
# resolved, then the minion will fail to start
5+
# resolved, then the minion will fail to start.
66
#master: salt
77

8-
# Set the post used by the master reply and authentication server
8+
# Set the port used by the master reply and authentication server
99
#master_port: 4506
1010

1111
# The user to run salt
@@ -24,18 +24,19 @@
2424
# clusters.
2525
#id:
2626

27-
# The minion connection to the master may be inturupted, the minion will
28-
# verify the connection every so many seconds, to disable connection
29-
# verification set this value to 0
27+
# If the the connection to the server is interrupted, the minion will
28+
# attempt to reconnect. sub_timeout allows you to control the rate
29+
# of reconnection attempts (in seconds). To disable reconnects, set
30+
# this value to 0.
3031
#sub_timeout: 60
3132

3233
# Where cache data goes
3334
#cachedir: /var/cache/salt
3435

3536
# The minion can locally cache the return data from jobs sent to it, this
36-
# can be a good way to keep track minion side of the jobs the minion has
37-
# executed. By default this feature is disabled, to enable set cache_jobs
38-
# to True
37+
# can be a good way to keep track of jobs the minion has executed
38+
# (on the minion side). By default this feature is disabled, to enable
39+
# set cache_jobs to True
3940
#cache_jobs: False
4041

4142
# When waiting for a master to accept the minion's public key, salt will
@@ -47,18 +48,20 @@
4748

4849
##### Minion module management #####
4950
##########################################
50-
# Disable specific modules, this will allow the admin to limit the level os
51+
# Disable specific modules. This allows the admin to limit the level of
5152
# access the master has to the minion
5253
#disable_modules: [cmd,test]
5354
#disable_returners: []
54-
# Modules can be loaded from arbitrary paths, this enables the easy deployment
55-
# of third party modules, modules for returners and minions can be loaded.
55+
#
56+
# Modules can be loaded from arbitrary paths. This enables the easy deployment
57+
# of third party modules. Modules for returners and minions can be loaded.
5658
# Specify a list of extra directories to search for minion modules and
5759
# returners. These paths must be fully qualified!
5860
#module_dirs: []
5961
#returner_dirs: []
6062
#states_dirs: []
6163
#render_dirs: []
64+
#
6265
# Enable Cython modules searching and loading. (Default: False)
6366
#cython_enable: False
6467

@@ -92,6 +95,12 @@
9295
# not on the master it will be deleted from the minion. By default this is
9396
# enabled and can be disabled by changing this value to False
9497
#clean_dynamic_modules: True
98+
#
99+
# Normally the minion is not isolated to any single environment on the master
100+
# when running states, but the environment can be isolated on the minion side
101+
# by statically setting it. Remember that the recommended way to manage
102+
# environments is to issolate via the top file.
103+
#environment: None
95104

96105
###### Security settings #####
97106
###########################################
@@ -112,14 +121,15 @@
112121
###########################################
113122
# The location of the minion log file
114123
#log_file: /var/log/salt/minion
124+
#
115125
# The level of messages to send to the log file.
116126
# One of 'info', 'quiet', 'critical', 'error', 'debug', 'warning'.
117127
# Default: 'warning'
118128
#log_level: warning
119129
#
120130
# Logger levels can be used to tweak specific loggers logging levels.
121-
# Imagine you want to have the salt library at the 'warning' level, but, you
122-
# still wish to have 'salt.modules' at the 'debug' level:
131+
# For example, if you want to have the salt library at the 'warning' level,
132+
# but you still wish to have 'salt.modules' at the 'debug' level:
123133
# log_granular_levels: {
124134
# 'salt': 'warning',
125135
# 'salt.modules': 'debug'
@@ -133,7 +143,7 @@
133143
# passed here in valid yaml format will be passed on to the salt minion modules
134144
# for use. It is STRONGLY recommended that a naming convention be used in which
135145
# the module name is followed by a . and then the value. Also, all top level
136-
# data must be allied via the yaml dict construct, some examples:
146+
# data must be applied via the yaml dict construct, some examples:
137147
#
138148
# A simple value for the test module:
139149
#test.foo: foo

‎debian/changelog

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
salt (0.9.7~pre2-0ppa1) lucid; urgency=low
2+
3+
* Fix arch and deps issue
4+
5+
-- Corey Quinn <corey@sequestered.net> Wed, 08 Feb 2012 17:22:47 -0800
6+
7+
salt (0.9.7~pre1-0ppa1) lucid; urgency=low
8+
9+
* Version bump, fixed a few issues
10+
11+
-- Corey Quinn <corey@sequestered.net> Wed, 08 Feb 2012 16:35:59 -0800
12+
13+
salt (0.9.6-1) lucid; urgency=low
14+
15+
* Bump version; time to upgrade
16+
17+
-- Corey Quinn <corey@sequestered.net> Tue, 07 Feb 2012 18:15:20 -0800
18+
119
salt (0.9.5-1) unstable; urgency=low
220

321
* First package release. (Closes: #643789)

‎debian/control

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@ Section: admin
33
Priority: optional
44
Maintainer: Corey Quinn <corey@sequestered.net>
55
Build-Depends: debhelper (>= 7.0.50~),
6-
python-support,
76
cython,
87
python-yaml,
98
python-setuptools,
109
python-crypto,
1110
python-m2crypto,
1211
python-zmq (>= 2.1.9),
1312
libzmq-dev (>= 2.1.9),
14-
python-all-dev,
1513
python-jinja2
1614
Standards-Version: 3.9.2
1715
Homepage: http://saltstack.org
@@ -20,21 +18,17 @@ Homepage: http://saltstack.org
2018

2119

2220
Package: salt-common
23-
Architecture: any
21+
Architecture: all
2422
Depends: ${python:Depends},
2523
${misc:Depends},
2624
${shlibs:Depends},
27-
python-support,
28-
cython,
29-
python-setuptools,
3025
python-yaml,
3126
python-crypto,
3227
python-m2crypto,
3328
python-zmq (>= 2.1.9),
34-
libzmq-dev (>= 2.1.9),
3529
python,
36-
python-dev,
37-
python-jinja2
30+
python-jinja2,
31+
msgpack-python
3832
Descrip F41A tion: Shared libraries that salt requires for all packages
3933
This package is a powerful remote execution manager that can be used
4034
to administer servers in a fast and efficient way.

‎debian/copyright

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Format: http://dep.debian.net/deps/dep5
22
Upstream-Name: salt
33
Upstream-Contact: salt-users@googlegroups.com
4-
Source: https://github.com/downloads/saltstack/salt/salt-0.9.5.tar.gz
4+
Source: https://github.com/downloads/saltstack/salt/salt-0.9.7.tar.gz
55

66
Files: *
77
Copyright: 2012 Thomas S Hatch <thatch45@gmail.com>

‎debian/rules

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
#!/usr/bin/make -f
22
#export DH_VERBOSE=1
33
%:
4-
dh $@ --buildsystem=python_distutils
5-
#override_dh_installinit:
6-
# dh_installinit --no-start --name="salt-master"
7-
# dh_installinit --no-start --name="salt-minion"
8-
# dh_installinit --no-start --name="salt-syndic"
9-
4+
dh $@ #--with python2
5+
dh_override_auto_build:
6+
python setup.py build #--install-layout=deb build
107
get-orig-source:
118
git clone https://github.com/saltstack/salt.git
12-
mv salt salt-0.9.5
13-
tar -zcvf salt_0.9.5.orig.tar.gz --exclude "debian*" --exclude-vcs salt-0.9.5
14-
rm -rf salt-0.9.5
9+
mv salt salt-0.9.7
10+
tar -zcvf salt_0.9.7.orig.tar.gz --exclude "debian*" --exclude-vcs salt-0.9.7
11+
rm -rf salt-0.9.7

‎debian/salt-common.install

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,2 @@
1-
salt/exceptions.py /usr/share/salt
2-
salt/loader.py /usr/share/salt
3-
salt/master.py /usr/share/salt
4-
salt/client.py /usr/share/salt
5-
salt/runner.py /usr/share/salt
6-
salt/output.py /usr/share/salt
7-
salt/minion.py /usr/share/salt
8-
salt/version.py /usr/share/salt
9-
salt/config.py /usr/share/salt
10-
salt/state.py /usr/share/salt
11-
salt/log.py /usr/share/salt
12-
salt/__init__.py /usr/share/salt
13-
salt/payload.py /usr/share/salt
14-
salt/crypt.py /usr/share/salt
15-
salt/runners /usr/share/salt/
16-
salt/renderers /usr/share/salt/
17-
salt/returners /usr/share/salt/
18-
salt/ext /usr/share/salt/
19-
salt/msgpack /usr/share/salt/
20-
salt/grains /usr/share/salt/
21-
salt/cli /usr/share/salt/
22-
salt/states /usr/share/salt/
23-
salt/utils /usr/share/salt/
24-
usr/lib/python2*/dist-packages/salt/msgpack
1+
usr/lib/python2*/dist-packages/salt/
252
debian/lintian-overrides /usr/share/lintian/overrides/salt-common

‎debian/salt-master.install

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
conf/master.template /etc/salt/master
2-
scripts/salt-key /usr/share/salt
3-
scripts/salt /usr/share/salt
4-
scripts/salt-run /usr/share/salt
5-
scripts/salt-cp /usr/share/salt
6-
scripts/salt-master /usr/share/salt
1+
conf/master.template /etc/salt
2+
scripts/salt-master /usr/bin
3+
scripts/salt-cp /usr/bin
4+
scripts/salt-run /usr/bin
5+
scripts/salt-key /usr/bin
6+
scripts/salt /usr/bin

‎debian/salt-master.links

Copy file name to clipboard
Lines changed: 0 additions & 5 deletions
This file was deleted.

‎debian/salt-minion.install

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
scripts/salt-minion /usr/share/salt
2-
scripts/salt-call /usr/share/salt
3-
salt/modules /usr/share/salt/modules
4-
conf/minion.template /etc/salt/minion
1+
conf/minion.template /etc/salt
2+
scripts/salt-minion /usr/bin
3+
scripts/salt-call /usr/bin

‎debian/salt-minion.links

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎debian/salt-syndic.install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
scripts/salt-syndic /usr/share/salt
1+
scripts/salt-syndic /usr/bin

‎debian/salt-syndic.links

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
usr/share/salt/salt-syndic /usr/bin/salt-syndic
1+
usr/lib/python2*/dist-packages/salt/salt-syndic /usr/bin/salt-syndic

‎doc/_static/favicon.ico

409 Bytes
Binary file not shown.

‎doc/_static/salt-vert.png

3.33 KB
Loading

0 commit comments

Comments
 (0)
0