Permalink
Browse files

Merge branch '0.9.7'

  • Loading branch information...
thatch45 committed Feb 15, 2012
2 parents c21a932 + 5450585 commit 1d1ab88d03064b8cd7c33033aa7a918cb0acb38c
Showing with 5,534 additions and 2,363 deletions.
  1. +23 −13 conf/master.template
  2. +24 −14 conf/minion.template
  3. +18 −0 debian/changelog
  4. +3 −9 debian/control
  5. +1 −1 debian/copyright
  6. +6 −9 debian/rules
  7. +1 −24 debian/salt-common.install
  8. +6 −6 debian/salt-master.install
  9. +0 −5 debian/salt-master.links
  10. +3 −4 debian/salt-minion.install
  11. +0 −2 debian/salt-minion.links
  12. +1 −1 debian/salt-syndic.install
  13. +1 −1 debian/salt-syndic.links
  14. BIN doc/_static/favicon.ico
  15. BIN doc/_static/salt-vert.png
  16. +0 −83 doc/_templates/index.html
  17. +0 −32 doc/_templates/indexsidebar.html
  18. +4 −4 doc/_templates/layout.html
  19. +0 −186 doc/_themes/saltstack/layout.html
  20. +0 −273 doc/_themes/saltstack/static/base-salt.css
  21. BIN doc/_themes/saltstack/static/salt-horiz.png
  22. +0 −3 doc/_themes/saltstack/theme.conf
  23. +14 −25 doc/conf.py
  24. +0 −3 doc/contents.rst
  25. +0 −80 doc/home.rst
  26. +187 −0 doc/index.rst
  27. +2 −2 doc/man/salt-call.1
  28. +4 −4 doc/man/salt-cp.1
  29. +14 −4 doc/man/salt-key.1
  30. +2 −2 doc/man/salt-master.1
  31. +2 −2 doc/man/salt-minion.1
  32. +3 −3 doc/man/salt-run.1
  33. +2 −2 doc/man/salt-syndic.1
  34. +2 −2 doc/man/salt.1
  35. +1,193 −510 doc/man/salt.7
  36. +9 −8 doc/ref/cli/index.rst
  37. +2 −2 doc/ref/cli/salt-cp.rst
  38. +10 −2 doc/ref/cli/salt-key.rst
  39. +1 −1 doc/ref/cli/salt-run.rst
  40. +17 −0 doc/ref/configuration/master.rst
  41. +15 −0 doc/ref/configuration/minion.rst
  42. +35 −8 doc/ref/grains.rst
  43. +2 −0 doc/ref/modules/all/index.rst
  44. +15 −0 doc/ref/modules/all/salt.modules.pkg.rst
  45. +24 −0 doc/ref/modules/all/salt.modules.sys.rst
  46. +29 −0 doc/ref/renderers/index.rst
  47. +27 −3 doc/ref/returners/index.rst
  48. +154 −50 doc/ref/states/highstate.rst
  49. +29 −29 doc/ref/states/index.rst
  50. +12 −7 doc/ref/states/ordering.rst
  51. +143 −0 doc/ref/states/top.rst
  52. +24 −4 doc/ref/states/writing.rst
  53. +0 −156 doc/topics/installation.rst
  54. +72 −0 doc/topics/jobs/index.rst
  55. +2 −2 doc/topics/releases/0.8.9.rst
  56. +2 −2 doc/topics/releases/0.9.0.rst
  57. +2 −2 doc/topics/releases/0.9.2.rst
  58. +2 −2 doc/topics/releases/0.9.3.rst
  59. +2 −2 doc/topics/releases/0.9.4.rst
  60. +47 −0 doc/topics/releases/0.9.6.rst
  61. +179 −0 doc/topics/releases/0.9.7.rst
  62. +50 −0 doc/topics/tutorials/bootstrap_ec2.rst
  63. +2 −2 doc/topics/tutorials/requisite_incl.rst
  64. +13 −7 doc/topics/tutorials/starting_states.rst
  65. +4 −0 doc/topics/tutorials/states_pt1.rst
  66. +1 −1 doc/topics/tutorials/states_pt3.rst
  67. +11 −0 pkg/rpm/README.fedora
  68. +24 −5 pkg/rpm/salt.spec
  69. +4 −3 requirements.txt
  70. +46 −7 salt/__init__.py
  71. +45 −9 salt/cli/__init__.py
  72. +15 −7 salt/cli/caller.py
  73. +113 −60 salt/cli/key.py
  74. +14 −5 salt/client.py
  75. +63 −6 salt/config.py
  76. +6 −6 salt/crypt.py
  77. +12 −1 salt/grains/core.py
  78. +29 −12 salt/loader.py
  79. +75 −4 salt/master.py
  80. +126 −25 salt/minion.py
  81. +3 −3 salt/modules/apt.py
  82. +60 −57 salt/modules/cmd.py
  83. +55 −3 salt/modules/cp.py
  84. +0 −1 salt/modules/cytest.pyx
  85. +18 −8 salt/modules/disk.py
  86. +3 −2 salt/modules/file.py
  87. +115 −0 salt/modules/freebsdservice.py
  88. +5 −0 salt/modules/hosts.py
  89. +456 −0 salt/modules/kvm_hyper.py
  90. +2 −0 salt/modules/linux_sysctl.py
  91. +130 −18 salt/modules/mysql.py
  92. +21 −16 salt/modules/network.py
  93. +68 −68 salt/modules/nginx.py
  94. +20 −0 salt/modules/ps.py
  95. +2 −1 salt/modules/publish.py
  96. +103 −8 salt/modules/puppet.py
  97. +2 −4 salt/modules/rh_service.py
  98. +97 −1 salt/modules/saltutil.py
  99. +1 −0 salt/modules/service.py
  100. +0 −3 salt/modules/solr.py
  101. +14 −8 salt/modules/ssh.py
  102. +35 −1 salt/modules/status.py
  103. +10 −7 salt/modules/test.py
  104. +9 −0 salt/modules/virtualenv.py
  105. +5 −10 salt/modules/yumpkg.py
  106. +5 −4 salt/modules/yumpkg5.py
  107. +2 −4 salt/output.py
  108. +104 −0 salt/runners/jobs.py
  109. +182 −133 salt/state.py
  110. +7 −10 salt/states/cmd.py
  111. +155 −18 salt/states/file.py
  112. +148 −0 salt/states/mysql_grants.py
  113. +66 −66 salt/states/mysql_user.py
  114. +82 −31 salt/states/pkg.py
  115. +43 −3 salt/states/service.py
  116. +4 −0 salt/states/ssh_auth.py
  117. +0 −1 salt/states/user.py
  118. +5 −0 salt/states/virtualenv.py
  119. +74 −5 salt/utils/__init__.py
  120. +1 −1 salt/utils/verify.py
  121. +1 −1 salt/version.py
  122. +1 −1 setup.py
  123. +10 −0 tests/files/conf/master
  124. +18 −0 tests/files/conf/minion
  125. +11 −0 tests/files/hosts
  126. +0 −13 tests/modules/__init__.py
  127. +50 −0 tests/modules/grains.py
  128. +87 −65 tests/modules/hosts.py
  129. +89 −5 tests/modules/test.py
  130. +9 −28 tests/runtests.py
  131. +114 −0 tests/saltunittest.py
  132. +3 −3 tests/simple.py
  133. +4 −3 tests/templates/jinja.py
View
@@ -31,11 +31,15 @@
# Set the number of hours to keep old job information
#keep_jobs: 24
+# Set the default timeout for the salt command and api, the default is 5
+# seconds
+#timeout: 5
+
# Set the directory used to hold unix sockets
#sock_dir: /tmp/salt-unix
# Set the acceptance level for serialization of messages. This should only be
-# set if the master is newer that 0.9.5 and the minion are older, this option
+# set if the master is newer than 0.9.5 and the minion are older. This option
# allows a 0.9.5 and newer master to communicate with minions 0.9.4 and
# earlier. It is not recommended to keep this setting on if the minions are
# all 0.9.5 or higher, as leaving pickle as the serialization medium is slow
@@ -59,9 +63,15 @@
##########################################
# The state system uses a "top" file to tell the minions what environment to
# use and what modules to use. The state_top file is defined relative to the
-# root of the base environment
+# root of the base environment.
#state_top: top.sls
#
+# The external_nodes option allows Salt to gather data that would normally be
+# placed in a top file. The external_nodes option is the executable that will
+# return the ENC data. Remember that Salt will look for external nodes AND top
+# files and combine the results if both are enabled!
+#external_nodes: None
+#
# The renderer to use on the minions to render the state data
#renderer: yaml_jinja
#
@@ -78,7 +88,7 @@
# The file server works on environments passed to the master, each environment
# can have multiple root directories, the subdirectories in the multiple file
# roots cannot match, otherwise the downloaded files will not be able to be
-# reliably ensured. A base environment is required to house the top file
+# reliably ensured. A base environment is required to house the top file.
# Example:
# file_roots:
# base:
@@ -110,15 +120,14 @@
# syndic servers(s) below it set the "order_masters" setting to True, if this
# is a master that will be running a syndic daemon for passthrough the
# "syndic_master" setting needs to be set to the location of the master server
-# to recieve commands from
+# to recieve commands from.
#
# Set the order_masters setting to True if this master will command lower
-# masters' syndic interfaces
+# masters' syndic interfaces.
#order_masters: False
#
-# If this master will be running a salt syndic daemon, then the syndic needs
-# to know where the master it is recieving commands from is, set it with the
-# syndic_master value
+# If this master will be running a salt syndic daemon, syndic_master tells
+# this master where to recieve commands from.
#syndic_master: masterofmaster
##### Peer Publish settings #####
@@ -129,9 +138,9 @@
# compartmentalization of commands based on individual minions.
#
# The configuration uses regular expressions to match minions and then a list
-# of regular expressions to match functions, the following will allow the
+# of regular expressions to match functions. The following will allow the
# minion authenticated as foo.example.com to execute functions from the test
-# and pkg modules
+# and pkg modules.
# peer:
# foo.example.com:
# - test.*
@@ -149,7 +158,7 @@
##########################################
# Salt supports automatic clustering, salt creates a single ip address which
# is shared among the individual salt components using ucarp. The private key
-# and all of the minion keys are maintained across the defined cluster masters
+# and all of the minion keys are maintained across the defined cluster masters.
# The failover service is automatically managed via these settings
# List the identifiers for the other cluster masters in this manner:
@@ -168,14 +177,15 @@
##########################################
# The location of the master log file
#log_file: /var/log/salt/master
+#
# The level of messages to send to the log file.
# One of 'info', 'quiet', 'critical', 'error', 'debug', 'warning'.
# Default: 'warning'
#log_level: warning
#
# Logger levels can be used to tweak specific loggers logging levels.
-# Imagine you want to have the salt library at the 'warning' level, but, you
-# still wish to have 'salt.modules' at the 'debug' level:
+# For example, if you want to have the salt library at the 'warning' level,
+# but you still wish to have 'salt.modules' at the 'debug' level:
# log_granular_levels:
# 'salt': 'warning',
# 'salt.modules': 'debug'
View
@@ -2,10 +2,10 @@
##### Primary configuration settings #####
##########################################
# Set the location of the salt master server, if the master server cannot be
-# resolved, then the minion will fail to start
+# resolved, then the minion will fail to start.
#master: salt
-# Set the post used by the master reply and authentication server
+# Set the port used by the master reply and authentication server
#master_port: 4506
# The user to run salt
@@ -24,18 +24,19 @@
# clusters.
#id:
-# The minion connection to the master may be inturupted, the minion will
-# verify the connection every so many seconds, to disable connection
-# verification set this value to 0
+# If the the connection to the server is interrupted, the minion will
+# attempt to reconnect. sub_timeout allows you to control the rate
+# of reconnection attempts (in seconds). To disable reconnects, set
+# this value to 0.
#sub_timeout: 60
# Where cache data goes
#cachedir: /var/cache/salt
# The minion can locally cache the return data from jobs sent to it, this
-# can be a good way to keep track minion side of the jobs the minion has
-# executed. By default this feature is disabled, to enable set cache_jobs
-# to True
+# can be a good way to keep track of jobs the minion has executed
+# (on the minion side). By default this feature is disabled, to enable
+# set cache_jobs to True
#cache_jobs: False
# When waiting for a master to accept the minion's public key, salt will
@@ -47,18 +48,20 @@
##### Minion module management #####
##########################################
-# Disable specific modules, this will allow the admin to limit the level os
+# Disable specific modules. This allows the admin to limit the level of
# access the master has to the minion
#disable_modules: [cmd,test]
#disable_returners: []
-# Modules can be loaded from arbitrary paths, this enables the easy deployment
-# of third party modules, modules for returners and minions can be loaded.
+#
+# Modules can be loaded from arbitrary paths. This enables the easy deployment
+# of third party modules. Modules for returners and minions can be loaded.
# Specify a list of extra directories to search for minion modules and
# returners. These paths must be fully qualified!
#module_dirs: []
#returner_dirs: []
#states_dirs: []
#render_dirs: []
+#
# Enable Cython modules searching and loading. (Default: False)
#cython_enable: False
@@ -92,6 +95,12 @@
# not on the master it will be deleted from the minion. By default this is
# enabled and can be disabled by changing this value to False
#clean_dynamic_modules: True
+#
+# Normally the minion is not isolated to any single environment on the master
+# when running states, but the environment can be isolated on the minion side
+# by statically setting it. Remember that the recommended way to manage
+# environments is to issolate via the top file.
+#environment: None
###### Security settings #####
###########################################
@@ -112,14 +121,15 @@
###########################################
# The location of the minion log file
#log_file: /var/log/salt/minion
+#
# The level of messages to send to the log file.
# One of 'info', 'quiet', 'critical', 'error', 'debug', 'warning'.
# Default: 'warning'
#log_level: warning
#
# Logger levels can be used to tweak specific loggers logging levels.
-# Imagine you want to have the salt library at the 'warning' level, but, you
-# still wish to have 'salt.modules' at the 'debug' level:
+# For example, if you want to have the salt library at the 'warning' level,
+# but you still wish to have 'salt.modules' at the 'debug' level:
# log_granular_levels: {
# 'salt': 'warning',
# 'salt.modules': 'debug'
@@ -133,7 +143,7 @@
# passed here in valid yaml format will be passed on to the salt minion modules
# for use. It is STRONGLY recommended that a naming convention be used in which
# the module name is followed by a . and then the value. Also, all top level
-# data must be allied via the yaml dict construct, some examples:
+# data must be applied via the yaml dict construct, some examples:
#
# A simple value for the test module:
#test.foo: foo
View
@@ -1,3 +1,21 @@
+salt (0.9.7~pre2-0ppa1) lucid; urgency=low
+
+ * Fix arch and deps issue
+
+ -- Corey Quinn <corey@sequestered.net> Wed, 08 Feb 2012 17:22:47 -0800
+
+salt (0.9.7~pre1-0ppa1) lucid; urgency=low
+
+ * Version bump, fixed a few issues
+
+ -- Corey Quinn <corey@sequestered.net> Wed, 08 Feb 2012 16:35:59 -0800
+
+salt (0.9.6-1) lucid; urgency=low
+
+ * Bump version; time to upgrade
+
+ -- Corey Quinn <corey@sequestered.net> Tue, 07 Feb 2012 18:15:20 -0800
+
salt (0.9.5-1) unstable; urgency=low
* First package release. (Closes: #643789)
View
@@ -3,15 +3,13 @@ Section: admin
Priority: optional
Maintainer: Corey Quinn <corey@sequestered.net>
Build-Depends: debhelper (>= 7.0.50~),
- python-support,
cython,
python-yaml,
python-setuptools,
python-crypto,
python-m2crypto,
python-zmq (>= 2.1.9),
libzmq-dev (>= 2.1.9),
- python-all-dev,
python-jinja2
Standards-Version: 3.9.2
Homepage: http://saltstack.org
@@ -20,21 +18,17 @@ Homepage: http://saltstack.org
Package: salt-common
-Architecture: any
+Architecture: all
Depends: ${python:Depends},
${misc:Depends},
${shlibs:Depends},
- python-support,
- cython,
- python-setuptools,
python-yaml,
python-crypto,
python-m2crypto,
python-zmq (>= 2.1.9),
- libzmq-dev (>= 2.1.9),
python,
- python-dev,
- python-jinja2
+ python-jinja2,
+ msgpack-python
Description: Shared libraries that salt requires for all packages
This package is a powerful remote execution manager that can be used
to administer servers in a fast and efficient way.
View
@@ -1,7 +1,7 @@
Format: http://dep.debian.net/deps/dep5
Upstream-Name: salt
Upstream-Contact: salt-users@googlegroups.com
-Source: https://github.com/downloads/saltstack/salt/salt-0.9.5.tar.gz
+Source: https://github.com/downloads/saltstack/salt/salt-0.9.7.tar.gz
Files: *
Copyright: 2012 Thomas S Hatch <thatch45@gmail.com>
View
@@ -1,14 +1,11 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
%:
- dh $@ --buildsystem=python_distutils
-#override_dh_installinit:
-# dh_installinit --no-start --name="salt-master"
-# dh_installinit --no-start --name="salt-minion"
-# dh_installinit --no-start --name="salt-syndic"
-
+ dh $@ #--with python2
+dh_override_auto_build:
+ python setup.py build #--install-layout=deb build
get-orig-source:
git clone https://github.com/saltstack/salt.git
- mv salt salt-0.9.5
- tar -zcvf salt_0.9.5.orig.tar.gz --exclude "debian*" --exclude-vcs salt-0.9.5
- rm -rf salt-0.9.5
+ mv salt salt-0.9.7
+ tar -zcvf salt_0.9.7.orig.tar.gz --exclude "debian*" --exclude-vcs salt-0.9.7
+ rm -rf salt-0.9.7
View
@@ -1,25 +1,2 @@
-salt/exceptions.py /usr/share/salt
-salt/loader.py /usr/share/salt
-salt/master.py /usr/share/salt
-salt/client.py /usr/share/salt
-salt/runner.py /usr/share/salt
-salt/output.py /usr/share/salt
-salt/minion.py /usr/share/salt
-salt/version.py /usr/share/salt
-salt/config.py /usr/share/salt
-salt/state.py /usr/share/salt
-salt/log.py /usr/share/salt
-salt/__init__.py /usr/share/salt
-salt/payload.py /usr/share/salt
-salt/crypt.py /usr/share/salt
-salt/runners /usr/share/salt/
-salt/renderers /usr/share/salt/
-salt/returners /usr/share/salt/
-salt/ext /usr/share/salt/
-salt/msgpack /usr/share/salt/
-salt/grains /usr/share/salt/
-salt/cli /usr/share/salt/
-salt/states /usr/share/salt/
-salt/utils /usr/share/salt/
-usr/lib/python2*/dist-packages/salt/msgpack
+usr/lib/python2*/dist-packages/salt/
debian/lintian-overrides /usr/share/lintian/overrides/salt-common
View
@@ -1,6 +1,6 @@
-conf/master.template /etc/salt/master
-scripts/salt-key /usr/share/salt
-scripts/salt /usr/share/salt
-scripts/salt-run /usr/share/salt
-scripts/salt-cp /usr/share/salt
-scripts/salt-master /usr/share/salt
+conf/master.template /etc/salt
+scripts/salt-master /usr/bin
+scripts/salt-cp /usr/bin
+scripts/salt-run /usr/bin
+scripts/salt-key /usr/bin
+scripts/salt /usr/bin
View
@@ -1,5 +0,0 @@
-usr/share/salt/salt /usr/bin/salt
-usr/share/salt/salt-master /usr/bin/salt-master
-usr/share/salt/salt-cp /usr/bin/salt-cp
-usr/share/salt/salt-key /usr/bin/salt-key
-usr/share/salt/salt-run /usr/bin/salt-run
@@ -1,4 +1,3 @@
-scripts/salt-minion /usr/share/salt
-scripts/salt-call /usr/share/salt
-salt/modules /usr/share/salt/modules
-conf/minion.template /etc/salt/minion
+conf/minion.template /etc/salt
+scripts/salt-minion /usr/bin
+scripts/salt-call /usr/bin
View
@@ -1,2 +0,0 @@
-usr/share/salt/salt-minion /usr/bin/salt-minion
-usr/share/salt/salt-call /usr/bin/salt-call
@@ -1 +1 @@
-scripts/salt-syndic /usr/share/salt
+scripts/salt-syndic /usr/bin
View
@@ -1 +1 @@
-usr/share/salt/salt-syndic /usr/bin/salt-syndic
+usr/lib/python2*/dist-packages/salt/salt-syndic /usr/bin/salt-syndic
View
Binary file not shown.
View
Binary file not shown.
Oops, something went wrong.

0 comments on commit 1d1ab88

Please sign in to comment.