valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,647 Commits 24 Branches 182 Tags 341 MiB
304516420c
Commit Graph

74647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Pashkin
304516420c Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running (#36875) 
* Add Visual Studio Code related directory .vscode/ to .gitignore

* Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running
 2016-10-12 13:20:30 -06:00
Theodore Cowan
046aa22409 Try to get SDB profile from pillar (#36934) 
* If sdb profile is not set in conf, try the pillar

* Carefully get sdb pillar in case this is the salt-master

* use current method of getting sdb profile name
 2016-10-12 10:40:19 -06:00
Őry, Máté
7d9fdfd0fe doc: document what the argument of salt --subset means (#36943) 2016-10-12 09:46:31 -06:00
Nicole Thomas
90bbf8dc4f Merge pull request #36931 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-12 09:26:17 -06:00
rallytime
55fe0aa2e4 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-11 17:22:12 -06:00
Erik Johnson
e5425f3e8c Revert change in default value for top_file_merging_strategy (#36922) 
This causes problems when a Carbon master tries to run states on a
non-Carbon minion.
 2016-10-11 16:33:23 -06:00
Olivier Mauras
de3d337fdd modules/apk.py: Ensure we don't error on version extraction (#36921) 2016-10-11 16:31:32 -06:00
Jacob Hammons
102f909bb4 Add FreeBSD and SmartOS to RC packages list (#36916) 2016-10-11 16:30:50 -06:00
Nicole Thomas
6516059d21 Merge pull request #36917 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-11 16:15:59 -06:00
rallytime
b196c9336a Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-11 13:54:09 -06:00
Jorge Schrauwen
f742e34555 smbios.get should handle missing /dev/mem to not have useless grains (#36909) 2016-10-11 13:50:56 -06:00
Nicole Thomas
b7f87e0aed Merge pull request #36915 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-11 13:49:42 -06:00
rallytime
971c27cba2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-11 13:00:17 -06:00
Erik Johnson
f3443fb992 Properly handle "shared" arg in git.init when it is a bool (#36912) 2016-10-11 12:54:15 -06:00
Joseph Hall
17253d001f Pass through port as int and not str (#36910) 2016-10-11 12:45:53 -06:00
Joseph Hall
2e3fc1e3a8 Handle missing cache data a little more gracefully (#36908) 2016-10-11 12:41:28 -06:00
Thomas S Hatch
7e2eba9cc7 Merge pull request #36776 from cro/prox_min_mgr 
Adapt MinionManager for Proxy Minions.
 2016-10-11 11:12:01 -06:00
Jorge Schrauwen
8b9648cd97 [develop] salt.modules.at was hopelessly broken on Solaris-like platforms (#36873) 
* disable current at module on solaris, only compute job_kw_regtex once

* provide at_solaris (virtual=at) for Solaris-like systems

* add proper maintainer header

* forgot to update the docs again

* add notice that at module only works on linux, openbsd, and freebsd

* salt.states.at needed a lot of love

* update at_state checks to pass valid date to at.at, at.jobcheck, at.atrm,...

* today I learn about mod_watch, and I want it for at
 2016-10-11 10:33:40 -06:00
Tim Fechner
7547761acc Fix #36461, AttributeError because of .lower() (#36462) 
* Fix #36461, AttributeError because of .lower()

* Add tests
 2016-10-11 10:29:22 -06:00
Benoît Knecht
0ebf7a451c modules: debian_ip: override params early to fix diff (#36820) 
Slave interfaces have some of their parameters overridden before being written
to file, but when Salt is ran in test mode, those overridden values aren't
taken into account. This results in the test run showing that changes will be
applied, even though the configuration hasn't changed at all:

        ID: ens2f1
  Function: network.managed
    Result: None
   Comment: Interface ens2f1 is set to be updated:
            ---
            +++
            @@ -1,4 +1,3 @@
             auto ens2f1
            -iface ens2f1 inet manual
            -    bond-master bond0
            +iface ens2f1 inet static
   Started: 09:07:41.719716
  Duration: 1.91 ms
   Changes:

This commit overrides those values in _parse_settings_eth instead of
_write_file_ifaces, so that the test run shows what's really going to be
modified.
 2016-10-11 10:17:44 -06:00
Nicole Thomas
89c7286928 Add versionadded tag for new create_datacenter function (#36905) 2016-10-11 10:03:42 -06:00
Justin Findlay
a23ce84e57 states.schedule: splay is not ordereddict (#36894) 2016-10-11 09:03:58 -06:00
Steeve
6654444fea [fix] pkg.installed call on pkg.install (#36904) 2016-10-11 08:55:53 -06:00
Alexandru Bleotu
6c441cb288 Create datacenter gh (#36826) 
*  Added salt.utils.create_datacenter that creates a VMWare datacenter

* Added tests for salt.utils.vmware.create_datacenter
 2016-10-11 08:49:53 -06:00
Vitaliy Fuks
50d51766e9 Typos are not fun! (#36901) 2016-10-11 08:45:15 -06:00
Erik Johnson
bdbf1619cb Check for test=True in salt.wait_for_event orchestration events (#36897) 
This prevents a wait_for_event from hanging the orchestration job when
test=True.
 2016-10-10 17:00:42 -06:00
Seth House
6e4bf4cbe8 Add full SSE demo (#36878) 
* Add proof-of-concept for consuming the SSE stream via JavaScript

* Add SSE demo app as default for the /app endpoint

* Switch SSE async warning with good async example and recommendations
 2016-10-10 13:45:02 -06:00
Nicole Thomas
86ac8bd680 Merge pull request #36885 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-10 13:30:25 -06:00
Erik Johnson
cb92f8656a Fix traceback on "salt-ssh -h" (#36888) 
This code was originally added to the option parser in 423a356. It was
probably intended to be a single string continued onto multiple lines
via parenthesis, but the use of a comma turns this into a tuple, which
causes a traceback when "salt-ssh -h" is run.
 2016-10-10 13:30:05 -06:00
Michał Sochoń
ab206915dd Update tutorial.rst (#36892) 
Fix error in the list.
 2016-10-10 13:29:14 -06:00
Erik Johnson
1c0ba8012c salt-ssh: Try "command -v" before falling back to "which" (#36889) 
This makes salt-ssh work better on minimal installs such as the CentOS 7
container images from linuxcontainers.org.
 2016-10-10 13:28:41 -06:00
Nicole Thomas
33c3b8a6c3 Merge pull request #36883 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-10 11:39:14 -06:00
Jacob Hammons
dff93f89ff Update list of RC build platforms, fix example (#36887) 2016-10-10 11:36:48 -06:00
Nicole Thomas
e2de78b130 Merge pull request #36884 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-10 11:22:23 -06:00
Nicole Thomas
e76f05ec48 Fix KeyError when loading runit execution module (#36882) 
Fixes #36865
 2016-10-10 10:59:35 -06:00
Nicole Thomas
3bb1bcc854 Merge pull request #36886 from rallytime/bp-36874 
Back-port #36874 to carbon
 2016-10-10 10:28:11 -06:00
m03
077645d054 Fix shell_info docstring example 2016-10-10 10:25:12 -06:00
rallytime
c09b9d6e6a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-10 10:21:04 -06:00
rallytime
9ae34b2329 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/beacons/index.rst
 2016-10-10 10:19:50 -06:00
rallytime
d07f5612ee Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-10 10:18:02 -06:00
Moe
f528b9f292 Fix shell_info docstring example (#36874) 2016-10-10 09:58:18 -06:00
Jorge Schrauwen
0b304e75a3 missing docs for salt.modules.apcups (#36863) 2016-10-08 19:51:45 -06:00
Jorge Schrauwen
ee9eb7c413 rbac_solaris should be included in the docs (#36859) 
* rbac_solaris - want module docs

* rbac_solaris - want state docs
 2016-10-08 07:54:26 -06:00
Erik Johnson
85eea4d6ee fileclient: Change queryarg comparison from None to simple boolean check (#36830) 
When there are no queryargs, the ``query`` attribute is an empty string,
not ``None``.
 2016-10-08 07:50:49 -06:00
Nicole Thomas
7dd7c23d4f Merge pull request #36840 from kakwa/fix-test-state.apply-boto_ec2.instance_present 
fix return of boto_ec2.instance_present if test=True
 2016-10-08 07:50:07 -06:00
Mike Place
549771341d Merge pull request #36842 from sjorge/develop-smartos-state 
smartos.vm_present state toggle for enforcement of tags/metadata
 2016-10-08 14:31:21 +09:00
Mike Place
9a819693ff Merge pull request #36845 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-08 14:29:10 +09:00
Mike Place
94aa016e47 Merge pull request #36856 from sjorge/develop-rbac_solaris-module 
Solaris could really use RBAC support
 2016-10-08 14:26:59 +09:00
Mike Place
3ce4897b97 Merge pull request #36857 from terminalmage/systemd-unit-tests 
Add unit tests for systemd scope usage
 2016-10-08 14:22:05 +09:00
Mike Place
3fc5bc1a0d Merge pull request #36858 from pass-by-value/eventsource_example 
Add full example for salt-api /events
 2016-10-08 14:21:04 +09:00