Commit 7c0cc711 authored by Joe Healy's avatar Joe Healy

Imported Upstream version 2014.1.0+ds

parent 20ce79b5

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -23,6 +23,8 @@ Developers
Aaron Bull Schaefer <aaron@elasticdog.com>
Aaron Toponce <aaron.toponce@gmail.com>
Aditya Kulkarni <adi@saltstack.com>
Andre Sachs <andre@sachs.nom.za>
Andrew Kuhnhausen <trane@errstr.com>
Antti Kaihola <akaihol+github@ambitone.com>
archme <archme.mail@gmail.com>
......@@ -53,6 +55,7 @@ Jeff Hutchins <jhutchins@getjive.com>
Jeffrey C. Ollie <jeff@ocjtech.us>
Jeff Schroeder <jeffschroeder@computer.org>
Jonas Buckner <buckner.jonas@gmail.com>
Jonathan Harker <k.jonathan.harker@hp.com>
Joseph Hall <joseph@saltstack.com>
Josmar Dias <josmarnet@gmail.com>
Kent Tenney <ktenney@gmail.com>
......@@ -78,6 +81,15 @@ Thomas S Hatch <thatch45@gmail.com>
Tor Hveem <xt@bash.no>
Travis Cline <travis.cline@gmail.com>
Wieland Hoffmann <themineo+github@gmail.com>
Dan Garthwaite <dan@garthwaite.org>
deutsche
Johnny Bergström
lexual
Marat Shakirov
Matt Black
Peter Baumgartner
Robert Fielding
Sean Channel <pentabular@gmail.com>
Growing Community
......
......@@ -98,16 +98,6 @@ installed by running::
RedHat-based systems
````````````````````
If you are developing on a RedHat variant, be advised that the package provider
for newer Redhat-based systems (:doc:`yumpkg.py
<../ref/modules/all/salt.modules.yumpkg>`) relies on RedHat's python interface
for yum. The variants that use this module to provide package support include
the following:
* `RHEL`_ and `CentOS`_ releases 6 and later
* `Fedora Linux`_ releases 11 and later
* `Amazon Linux`_
If you are developing using one of these releases, you will want to create your
virtualenv using the ``--system-site-packages`` option so that these modules
are available in the virtualenv.
......@@ -124,10 +114,6 @@ You can use it doing the following::
./fedora_setup.sh build
./fedora_setup.sh install
.. _`RHEL`: https://www.redhat.com/products/enterprise-linux/
.. _`CentOS`: http://centos.org/
.. _`Fedora Linux`: http://fedoraproject.org/
.. _`Amazon Linux`: https://aws.amazon.com/amazon-linux-ami/
Installing dependencies on OS X
```````````````````````````````
......@@ -227,6 +213,9 @@ Edit the minion config file:
4. Uncomment and change the ``id:`` value to something descriptive like
"saltdev". This isn't strictly necessary but it will serve as a reminder of
which Salt installation you are working with.
5. If you changed the ``ret_port`` value in the master config because you are
also running a non-development version of Salt, then you will have to
change the ``master_port`` value in the minion config to match.
.. note:: Using `salt-call` with a :doc:`Standalone Minion </topics/tutorials/standalone_minion>`
......
Salt - Remote execution system
Copyright 2013 SaltStack Team
Copyright 2014 SaltStack Team
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......
Metadata-Version: 1.1
Name: salt
Version: 0.17.5
Version: 2014.1.0
Summary: Portable, distributed, remote execution and configuration management system
Home-page: http://saltstack.org
Author: Thomas S Hatch
......
===================
What is Salt Stack?
===================
==================
What is SaltStack?
==================
Salt is a new approach to infrastructure management. Easy enough to get
running in minutes, scalable enough to manage tens of thousands of servers,
......@@ -20,7 +20,7 @@ http://docs.saltstack.com
IRC Chat
========
Join the vibrant, helpful and positive Salt Stack chat room in Freenode at
Join the vibrant, helpful and positive SaltStack chat room in Freenode at
#salt. There is no need to introduce yourself, or ask permission to join in,
just help and be helped! Make sure to wait for an answer, sometimes it may take
a few moments for someone to reply.
......@@ -30,7 +30,7 @@ http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83
Salt Air
========
The Salt Stack YouTube channel is filled with Salt videos and presentations.
The SaltStack YouTube channel is filled with Salt videos and presentations.
Watch the latest Salt Air episodes for updates from Thomas on development,
catch tutorials, and stay on the cutting edge of Salt.
......@@ -39,8 +39,8 @@ http://www.youtube.com/user/saltstack
Mailing List
============
The Salt Stack community users mailing list is hosted by Google groups. Anyone
can post to ask questions about Salt Stack products and anyone can help answer.
The SaltStack community users mailing list is hosted by Google groups. Anyone
can post to ask questions about SaltStack products and anyone can help answer.
Join the conversation!
https://groups.google.com/forum/#!forum/salt-users
......@@ -53,7 +53,7 @@ Developing Salt
===============
The Salt development team is welcoming, positive, and dedicated to helping
people get new code and fixes into Salt Stack projects. Log into GitHub and get
people get new code and fixes into SaltStack projects. Log into GitHub and get
started with one of the largest developer communities in the world.
https://github.com/saltstack
# This file should normally be installed at: /etc/salt/cloud
##########################################
##### VM Defaults #####
##########################################
# Set the size of minion keys to generate, defaults to 2048
#
#keysize: 2048
# Set the default os being deployed. This sets which deployment script to
# apply. This argument is optional.
#
#script: bootstrap-salt
##########################################
##### Logging Settings #####
##########################################
# The location of the master log file
#
#log_file: /var/log/salt/cloud
# The level of messages to send to the console.
# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
#
# Default: 'info'
#
#log_level: info
# The level of messages to send to the log file.
# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
#
# Default: 'info'
#
#log_level_logfile: info
# The date and time format used in log messages. Allowed date/time formating
# can be seen here:
#
# http://docs.python.org/library/time.html#time.strftime
#
#log_datefmt: '%Y-%m-%d %H:%M:%S'
# The format of the console logging messages. Allowed formatting options can
# be seen here:
#
# http://docs.python.org/library/logging.html#logrecord-attributes
#
#log_fmt_console: '[%(levelname)-8s] %(message)s'
#log_fmt_logfile: '%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s'
# Logger levels can be used to tweak specific loggers logging levels.
# 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'
# 'saltcloud': 'info'
#
#log_granular_levels: {}
##########################################
##### Misc Defaults #####
##########################################
# Whether or not to remove the accompnaying SSH key from the known_hosts file
# when an instance is destroyed.
#
# Default: 'False'
#
#delete_sshkeys: False
base_ec2:
provider: my-ec2-config
image: ami-e565ba8c
size: Micro Instance
script: python-bootstrap
minion:
cheese: edam
ubuntu_rs:
provider: my-openstack-rackspace-config
image: Ubuntu 12.04 LTS
size: 256 server
script: Ubuntu
minion:
cheese: edam
fedora_rs:
provider: my-openstack-rackspace-config
image: Fedora 17
size: 256 server
script: Fedora
minion:
cheese: edam
# This file may be used in addition to, or instead of the files in the
# cloud.providers.d/ directory. The format for this file, and all files in that
# directory is identical.
#my-digitalocean-config:
# provider: digital_ocean
# client_key: wFGEwgregeqw3435gDger
# api_key: GDE43t43REGTrkilg43934t34qT43t4dgegerGEgg
# location: New York 1
#my-aws-quick-start:
# provider: ec2
# id: HJGRYCILJLKJYG
# key: 'kdjgfsgm;woormgl/aserigjksjdhasdfgn'
# keyname: test
# securitygroup: quick-start
# private_key: /root/test.pem
#my-aws-default:
# provider: ec2
# id: HJGRYCILJLKJYG
# key: 'kdjgfsgm;woormgl/aserigjksjdhasdfgn'
# keyname: test
# securitygroup: default
# private_key: /root/test.pem
#my-gogrid-config:
# provider: gogrid
# apikey: asdff7896asdh789
# sharedsecret: saltybacon
#my-openstack-hp-config:
# provider: openstack
# identity_url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/'
# compute_name: Compute
# compute_region: 'az-1.region-a.geo-1'
# tenant: myuser-tenant1
# user: myuser
# ssh_key_name: mykey
# ssh_key_file: '/etc/salt/hpcloud/mykey.pem'
# password: mypass
#my-ibmsce-config:
# provider: ibmsce
# user: myuser@mycorp.com
# password: mypass
# ssh_key_name: mykey
# ssh_key_file: '/etc/salt/ibm/mykey.pem'
# location: Raleigh
#my-joyent-config:
# provider: joyent
# user: fred
# password: saltybacon
# private_key: /root/joyent.pem
#my-linode-config: