valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,109 Commits 24 Branches 182 Tags 341 MiB
5901b10c14
Commit Graph

807 Commits

Author SHA1 Message Date
rallytime
5901b10c14 Remove deprecated Legacy Git Pillar code 2017-08-23 16:49:58 -04:00
Nicole Thomas
d8b7afbbd1 Merge pull request #42928 from UtahDave/remove_stormpath2 
Remove stormpath2
 2017-08-15 10:09:23 -04:00
David Boucha
0ceb8009c7 remove Stormpath module, states and docs 2017-08-14 16:03:00 -06:00
rallytime
78e744bda4 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/client/mixins.py
  - salt/fileclient.py
  - salt/modules/status.py
  - tests/integration/states/test_npm.py
 2017-08-14 14:21:17 -04:00
rallytime
29ff19c587 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/states/dockerng.py
  - salt/utils/cloud.py
 2017-08-11 15:17:19 -04:00
Erik Johnson
35e05c9515 Add note about git CLI requirement for GitPython to GitFS tutorial 2017-08-10 16:47:47 -05:00
rallytime
08bbcf5790 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
 2017-08-10 14:51:27 -04:00
Ch3LL
90a2fb66a2 Fix typo for template_dict in http docs 2017-08-07 16:45:42 -04:00
rallytime
f20f3742cb Merge branch '2017.7' into 'develop' 
Conflicts:
  - tests/unit/test_crypt.py
 2017-08-07 10:43:06 -04:00
rallytime
36a1bcf8c5 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_wua.py
  - salt/utils/schedule.py
  - tests/unit/modules/rabbitmq_test.py
 2017-07-27 14:00:15 -06:00
rallytime
e3a6717efa Add info about top file to pillar walk-through example to include edit.vim 
The pillar example in the "Pillar Makes Simple States Grow Easily" section does
not meniton that the new file `/srv/pillar/edit/vim.sls` created for the example
must be included in the pillar top file in order for the references to work.

This PR adds that documentation so that the example works correctly.

Fixes #42405
 2017-07-24 12:17:41 -06:00
rallytime
e512a29f08 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/state.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - salt/version.py
  - tests/unit/config/test_config.py
  - tests/unit/modules/test_zypper.py
 2017-06-28 11:31:53 -06:00
Mike Place
df5a112a9b Merge pull request #41904 from twangboy/docs_win_add_firewall 
Fix anchor to _linux-iptables
 2017-06-22 11:16:23 -05:00
twangboy
d49bfd02a4 Fix anchor to _linux-iptables 2017-06-22 09:46:29 -06:00
Erik Johnson
1279f56c56 gitfs: Add two new options to affect saltenv mapping 
This adds 2 new config options:

- gitfs_disable_saltenv_mapping - This allows a user to disable the environment mapping logic and rely solely on per-saltenv configuration
- gitfs_ref_types - This allows individual ref types to be ignored

It also includes a performance improvement in retrieving tree objects
matching the desired ref name. Before, we would iterate through the
different refs and check if the name matched the desired ref's name.
Now we just check for a head/tag ref based on the ref path in the
gitdir (e.g. refs/remotes/origin/master or refs/tags/v1.2.3). This
prevents us from needlessly iterating through all refs until a match is
found, which does not scale well when the number of branches and tags is
larger.
 2017-06-21 12:42:48 -05:00
rallytime
7fef4cf38f Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
 2017-06-15 10:57:27 -06:00
Mike Place
c58f3811ce Merge pull request #41746 from rallytime/version-added-nitrogen 
Update Nitrogen references to 2017.7.0
 2017-06-15 10:12:18 -05:00
rallytime
d7ecd3c149 Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-06-14 13:35:50 -06:00
twangboy
795a1aab4f Add instructions for Windows Firewall 2017-06-14 11:42:00 -06:00
rallytime
c5b75d030a Update Nitrogen references to 2017.7.0 in doc/* 2017-06-14 11:36:06 -06:00
rallytime
4100e2b6a6 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-10 15:32:33 -06:00
rallytime
ef0df4a954 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_network.py
  - salt/modules/win_pkg.py
  - salt/utils/gitfs.py
  - tests/unit/modules/test_win_network.py
  - tests/unit/states/test_file.py
 2017-05-09 14:32:49 -06:00
Nicole Thomas
d2ae7deff2 Merge pull request #41148 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-09 14:23:28 -06:00
rallytime
aba35e20dd Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-05-09 11:14:05 -06:00
Erik Johnson
f6a16956a0 Add note on lack of support for VSTS in older libssh2 releases. 2017-05-08 07:59:53 -05:00
Erik Johnson
59737a34a5 Rename the *_env_blacklist config opts to *_saltenv_blacklist 
These were overlooked a while back when we deprecated env in favor of
saltenv.
 2017-05-06 23:11:33 -05:00
Erik Johnson
8c6410e3cd Add notices about ssl_verify only working in 0.23.2 and newer 2017-05-05 17:04:23 -05:00
Erik Johnson
f73c4b7167 Add http(s) auth config docs for GitPython 2017-05-05 16:56:01 -05:00
rallytime
01a012bbdf Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-05 10:12:18 -06:00
rallytime
c91bb18298 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/pip.py
  - salt/states/saltmod.py
 2017-05-04 11:49:33 -06:00
Erik Johnson
c757eda331 Clarify gitfs docs 
This improves cross links to the per-remote docs from the master config
file documentation.
 2017-05-03 13:34:56 -05:00
Erik Johnson
ebae1d8fe9 Merge pull request #40985 from ekristen/feature/remote-as-formula 
[Feature] Turns a gitfs remote into a true "formula", merges specified branch into current saltenv
 2017-05-03 12:17:17 -05:00
Erik Johnson
d6cd5056cf Enhance the Global Remotes docs 2017-05-02 16:37:56 -05:00
Erik Johnson
74ef0bf1d7 Clarify that it is only all_saltenvs which is new in Oxygen 
Depending on how you read it, the previous version may have suggested
that all of the per-remote parameters are new in Oxygen. This makes it
more explicit that the all_saltenvs param is the only one new to Oxygen.
 2017-05-02 09:10:21 -05:00
Erik Kristensen
fa1e56ad14 rename to all_saltenvs, add initial documentation 2017-05-01 08:56:18 -06:00
Anthony Shaw
4fce227190
update the tutorials and docs 2017-04-30 20:32:44 +10:00
Anthony Shaw
11907ae3b2 Update libcloud.rst 2017-04-28 19:01:21 +10:00
Anthony Shaw
e2dc7bf141
format rst in tutorial 2017-04-27 06:32:25 +10:00
Anthony Shaw
f983d7e07b
enable load balancer to support extended arguments in create and destroy balancer 2017-04-26 21:10:43 +10:00
Anthony Shaw
e384754cb3
tutorial for the libcloud modules 2017-04-26 15:09:08 +10:00
rallytime
52edbffc85 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/cache/all/index.rst
  - doc/topics/cache/index.rst
  - salt/cache/localfs.py
  - salt/modules/boto_rds.py
  - salt/roster/cloud.py
  - salt/states/virtualenv_mod.py
  - tests/integration/states/test_archive.py
  - tests/unit/modules/test_dockermod.py
  - tests/unit/states/dockerng_test.py
 2017-03-28 17:09:30 -06:00
Pedro Algarvio
7dc11df8ef
Update existing tests documentation. 2017-03-28 19:04:05 +01:00
Mike Place
338148de2c Cleaned up language slightly 2017-03-27 17:26:58 -06:00
rallytime
5363e0b58b Update minion data cache documentation 
Updats the existing documentation and also adds more documentation
to the Multi-Master and Syndic topology files about the addition
of the pluggable minion data store.
 2017-03-24 14:25:46 -06:00
Tyler Goodlet
8bfa8e0d15 Document qcow support 2017-03-23 23:36:32 -04:00
Nicole Thomas
c284a82dfa Merge pull request #40032 from tgoodlet/virt_fixups 
Some random salt-virt bug fixes and docs fixups
 2017-03-21 10:32:42 -06:00
rallytime
caebd5d8cf Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/targeting/nodegroups.rst
  - salt/runners/manage.py
 2017-03-16 17:23:57 -06:00
rallytime
72d16c9fa9 Update "yaml" code-block references with "jinja" where needed 
There are many `.. code-block: yaml` definitions that should really
be `.. code-block: jinja` definitions. This commit cleans up some
of those and removes warnings like these from the doc build:

```
WARNING: Could not lex literal_block as "yaml". Highlighting skipped.
```
 2017-03-15 10:22:19 -06:00
Tyler Goodlet
466e96c99b Fixup and add more details to virt docs 
`virt.hyper_info` no longer exists; switch to `virt.host_info`.
Document `virt.list` for listing all machines on all hypervisors.
Add more details regarding how images are copied to hypervisor minions
and cloned locally before configuration, seeding and boot.
 2017-03-15 02:37:03 -04:00
Tyler Goodlet
fafa94daeb Fix docs bug about VNC consoles being created by default 2017-03-15 02:37:03 -04:00