valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,689 Commits 24 Branches 182 Tags 341 MiB
58e16a0d39
Commit Graph

6827 Commits

Author SHA1 Message Date
Erik Johnson
aa6bd51b6b Add Pillar Decryption info to Nitrogen release notes 2017-01-31 11:25:58 -06:00
Erik Johnson
18a58b2b63 Document pillar decryption feature in pillar docs 2017-01-31 11:25:58 -06:00
Erik Johnson
dec7cbf9c5 Add documentation on pillar decryption config items 2017-01-31 11:25:56 -06:00
Nicole Thomas
11a99d8be0 [develop] Update release numbers for doc build (#39041) 2017-01-30 15:51:40 -07:00
Nicole Thomas
7fa89303a1 Merge pull request #39026 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-30 10:39:18 -07:00
Julien BONACHERA
1e06f388bb make openvswitch state work with python3 (#38873) 
* openvswitch: add a basic unit test for openvswitch

* openvswitch: enclose comments_* variables into a map

* openvswitch: only prepare error messages if type parameter is present

* openvswitch: add test case: create a GRE port

* openvswitch: remove trailing whitespace

* openvswitch: add missing "comments" variable

* openvswitch: pep8 compliance

* openvswitch: mock dig.check_ip

* openvswitch: rename "type" argument into "tunnel_type"

* openvswitch: reference bridge_exists before assignment

* openvswitch: reference port_list before assignment

* openvswitch: add upgrade note about "type" option renaming
 2017-01-30 09:56:10 -07:00
rallytime
8928436bdd Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/pillar/__init__.py
 2017-01-30 09:06:27 -07:00
rallytime
76e95087fd Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-27 11:52:03 -07:00
Mike Place
cfdbc99e12 Merge pull request #38989 from alprs/docfix-state_pt3_environ 
Documentation: fix SLS in environment variable examples
 2017-01-27 10:00:07 -07:00
Andreas Lutro
52a9ad1c60 fix SLS in environment variable examples 2017-01-27 11:19:04 +01:00
rallytime
e91fcbeaac Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/minion.py
  - salt/modules/dockerng.py
  - salt/thorium/key.py
 2017-01-26 16:02:06 -07:00
rallytime
fdaa5ac1b0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/master.py
  - salt/pillar/__init__.py
  - salt/utils/__init__.py
 2017-01-26 14:09:37 -07:00
Mike Place
664748e959 Add documentation release note for change in system module (#38975) 
Refs #38968
 2017-01-26 12:09:17 -07:00
Markus
7ff098426d comments on version number and git (#38961) 2017-01-26 09:21:16 -07:00
Erik Johnson
6b014e53fc Rename on_demand_pillar to on_demand_ext_pillar 2017-01-25 15:08:57 -06:00
Erik Johnson
d216f90c63 Document new on_demand_pillar option and add to config template 2017-01-25 14:43:14 -06:00
Mike Place
f9b2719ed3 Merge pull request #38942 from cloudflare/NET-RUNNER 
New runner: net finder
 2017-01-25 13:21:27 -07:00
Mike Place
e420763285 Merge pull request #38944 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-25 12:44:42 -07:00
Mike Place
f94b8798b6 Merge pull request #38918 from thatch45/thorium_typos 
Thorium typos
 2017-01-25 12:00:40 -07:00
rallytime
49f57ba3f1 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/utils/win_functions.py
 2017-01-25 09:59:29 -07:00
rallytime
ee33a53a64 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - tests/unit/doc_test.py
 2017-01-25 09:43:12 -07:00
Mircea Ulinic
317fb48ec7 net runner doc 2017-01-25 15:54:45 +00:00
Robert James Hernandez
9cc9c6110d Adding explicit call to python-systemd in jessie-backports 2017-01-24 14:25:45 -08:00
Thomas S Hatch
0b4aca9145 fix some minor typos in the thorium docs 2017-01-24 10:05:23 -07:00
Erik Johnson
42a3652620 Add top file merging docs to the master config file documentation 
Also put the top file stuff in its own section of the minion config
file, along with a message explaining that these options are only used
in masterless salt.
 2017-01-23 20:38:03 -06:00
Megan Wilhite
2786e209c6 add 2016.11.2 changelog to release notes (#38848) 2017-01-20 15:32:45 -07:00
Nicole Thomas
1262fa8ef8 Merge pull request #38843 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-20 14:01:12 -07:00
Mike Place
5d126a2772 Merge pull request #38828 from eradman/pillarenv 
Extend support for pillarenv_from_saltenv to master config
 2017-01-20 12:15:02 -07:00
rallytime
3f74d697b9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - pkg/windows/build_pkg.bat
  - salt/modules/archive.py
 2017-01-20 12:07:19 -07:00
Nicole Thomas
a275b9714e Merge pull request #38815 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-20 11:53:00 -07:00
David Boucha
1d13dd971e add info about what is cached 2017-01-19 16:56:40 -07:00
David Boucha
6a07a8de00 fix config example 2017-01-19 15:56:40 -07:00
David Boucha
a643340632 Add documentation for the Minion data cache 
Includes docs for localfs and consul minion data cache modules
 2017-01-19 15:53:22 -07:00
Ch3LL
31f324c4ff add 2016.3.5 changelog to release notes 2017-01-19 15:43:28 -07:00
Eric Radman
9b5d28df0c Extend support for pillarenv_from_saltenv to master config 
`pillarenv_from_saltenv` is already an option for minion config, this
change enables this feature on the master.

If set to `true` salt will derive the pillar environment set on the
master:

$ salt-run pillar.show_pillar saltenv=radman
my_passphrase:
    XYZ

$ sudo salt-run pillar.show_pillar saltenv=radman2
my_passphrase:
    ABC
 2017-01-19 13:34:33 -05:00
rallytime
315b2c8712 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/win_system.py
  - tests/unit/modules/win_system_test.py
 2017-01-18 14:16:45 -07:00
David Boucha
dbe9edb806 fix reactor example. 
This version is tested on 2016.11 branch and was found working
ZD 1035
 2017-01-18 11:46:34 -07:00
SaltyCharles
e127013892 update gitfs.rst for clarity 
Add note for "Unsupported URL Protocol" error when using pygit2 without libssh2.
 2017-01-17 15:44:00 -08:00
rallytime
1e125e2844 Update pillar tutorial lanuage regarding pillar_opts settings 
The pillar_opts option defaults to ``False``. This change updates
the language in the pillar tutoral to be in-line with the default
setting.

Fixes #38629
 2017-01-17 14:55:17 -07:00
rallytime
64d866f7ab Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-17 11:44:26 -07:00
rallytime
5b43a252c9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - conf/master
  - doc/topics/installation/ubuntu.rst
  - salt/modules/pillar.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/influxdb_user.py
  - salt/utils/minions.py
  - salt/utils/openstack/nova.py
 2017-01-17 09:50:06 -07:00
Denys Havrysh
4620dc4afa DOCS: add C++ compiler installation on RHEL required for bundled 0mq 2017-01-17 15:02:31 +02:00
rallytime
30e8a66fb0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2017-01-16 18:54:14 -07:00
Eric Radman
17fc12175c Try to resolve guest IP if VMware Tools is not installed 
In some cases installation of VMware Tools is not possible. Enable
salt-cloud to bootstrap a minion by using DNS to resolve it's IP.
 2017-01-15 22:42:53 -05:00
rallytime
d24776f5e9 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/master
  - doc/topics/netapi/index.rst
  - salt/netapi/__init__.py
 2017-01-15 16:07:55 -07:00
Mike Place
909bb15873 Merge pull request #38673 from kyrias/por_doc 
ref/configuration/master: Document ping_on_rotate
 2017-01-15 11:01:18 -07:00
Mike Place
0ad5d22ad4 Merge pull request #38703 from yhekma/docfix 
The `test` option is only valid for the minion, not the master
 2017-01-15 10:56:22 -07:00
Mike Place
ffae20ee58 Merge pull request #38686 from cloudflare/STATUSPAGE-STATE 
New state: statuspage
 2017-01-15 07:51:35 -07:00
Mike Place
f4233bb18d Merge pull request #38739 from vutny/fix-runtests-doc 
DOCS: correct examples of running test suite
 2017-01-15 07:35:47 -07:00
Denys Havrysh
b872bb63f6 DOCS: correct examples of running test suite 2017-01-15 11:48:04 +02:00