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

77549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Embery
f1bbc294df avoid commits if config already applied, use salt template system, small bugfix for junos <14.2 2017-01-30 11:42:39 -05:00
Nathan Embery
05db0c963c merge back to upstream 2017-01-30 10:03:14 -05:00
Nitin Kumar
6b5a75d16b Merge pull request #3 from rajvidhimar/refine-junos-module 
Refine junos module
 2017-01-27 17:05:59 +05:30
rajvidhimar
8fa99775b8 Doc string changes 2017-01-27 16:44:28 +05:30
rajvidhimar
410f131a36 Changed docstrings 2017-01-27 16:21:12 +05:30
rajvidhimar
0843c22311 Minor changes in state modules to keep in sync with execution modules. Improved documentation in junos proxy and junos state modules 2017-01-27 15:41:57 +05:30
rajvidhimar
4221ddbfea Making code pep8 compliant 2017-01-27 14:21:39 +05:30
rajvidhimar
b2721d9cee Merge remote-tracking branch 'upstream/develop' into refine-junos-module 
Conflicts:
	salt/proxy/junos.py
 2017-01-27 10:55:41 +05:30
Nitin Kumar
45a2194d88 Merge pull request #2 from rajvidhimar/junos_engine 
Junos engine
 2017-01-27 10:50:15 +05:30
rajvidhimar
3771ae109d Merge remote-tracking branch 'upstream/develop' into junos_engine 2017-01-27 10:37:07 +05:30
rajvidhimar
2d1530fd6d Change the way kwargs are passed. 2017-01-27 10:35:15 +05:30
Mike Place
efa83bc6f0 Merge pull request #38976 from rallytime/develop-docstring-fixes 
More docstring fixes for the new sysmod doc test failures
 2017-01-26 12:58:34 -07:00
Nathan Embery
24b4890ee5 install_config allow templates from any backend, not just local file 2017-01-26 14:54:52 -05:00
Nicole Thomas
ca090fff1a Add new logging options to parsers_test mock for develop (#38974) 2017-01-26 12:47:23 -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
rallytime
089ad59b90 Update the vsphere execution module docs to satisfy failing doc test 
- Added the "CLI Example:" syntax to function that were missing it
- Added docs to functions missing any docs and CLI examples
- Added to functions to allow_failure in sysmod test as needed
- Also adjusted the ordering of the allow_failure structure to make it
  easier to see which modules/funcitons were included (alphabetize)
 2017-01-26 11:56:06 -07:00
Mike Place
930af56299 Merge pull request #38960 from github-abcde/runners-pillar-pillarenv 
runners/pillar.py: Updated documentation to use pillarenv instead of …
 2017-01-26 11:39:58 -07:00
rallytime
5aa70bbbe7 Add "CLI Example:" language to satisfy doc test for solrcloud module 2017-01-26 11:31:59 -07:00
Mike Place
10b2224582 Merge pull request #38968 from raazvvann/dev/rheghedu/system-time 
system: change get_system_time returned format
 2017-01-26 11:28:29 -07:00
Mike Place
bd982c7122 Merge pull request #38969 from jakubjosef/develop 
Fixed generating job diffs in Jenkins state
 2017-01-26 11:22:59 -07:00
Mike Place
07f4c59a56 Merge pull request #38967 from raazvvann/dev/rheghedu/system-hostname 
system: add {set/get}_computer_name
 2017-01-26 11:01:08 -07:00
Jakub Josef
c64d2f88e5 Fixed generating job diffs in Jenkins state 2017-01-26 17:51:03 +01:00
Heghedus Razvan
5728490442 system: change get_system_time returned format 
Change returned format from "HH:MM AM/PM" to
"HH:MM:SS AM/PM"

Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2017-01-26 18:36:21 +02:00
Markus
7ff098426d comments on version number and git (#38961) 2017-01-26 09:21:16 -07:00
Heghedus Razvan
db41f60499 system: add {set/get}_computer_name 
Add {set/get}_computer_name for setting/getting
computer hostname. I add this in system module to be
the same as on windows, creating a cross-platform
way to interact with computer's hostname.

Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2017-01-26 17:47:41 +02:00
herbert.buurman
eefbcd22cb runners/pillar.py: Updated documentation to use pillarenv instead of saltenv when wanting to show the pillar of a specific environment. Added parsing of pillarenv argument so it actually gets used. 2017-01-26 11:57:50 +01: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
5bea8bc5c1 Merge pull request #38943 from thatch45/ssh_pillar_master 
When we generate the pillar we should send in the master opts
 2017-01-25 13:10:19 -07:00
Mike Place
7ca6b81611 Merge pull request #38912 from daxroc/feature/http_wait_for_interval 
Enhanced wait_for_successful_query with request_interval
 2017-01-25 12:43:44 -07:00
Mike Place
bbadc37301 Merge pull request #38945 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-25 12:36:18 -07:00
Mike Place
7febac8669 Merge pull request #38947 from eradman/ssh_options 
Fix ssh key deployment when using minimal salt-ssh roster
 2017-01-25 12:35:56 -07:00
C. R. Oldham
c45b99661b Merge pull request #38920 from spidercensus/patch-1 
Add device port option to proxy
 2017-01-25 11:56:33 -07:00
Mircea Ulinic
2c5f21bc2b Import & use print_function from __future__ 2017-01-25 18:26:36 +00:00
Thomas S Hatch
289985502b try it with a different init sequence 2017-01-25 11:14:22 -07:00
Thomas S Hatch
49ddbbf298 make it a deepcopy 2017-01-25 10:57:20 -07:00
Eric Radman
3e03f8a400 Fix ssh key deployment when using minimal salt-ssh roster 
Allows this code path to succeed for a minimal roster file that does not
specify `ssh_options`

$ sudo salt-ssh 'login1*' test.ping
Permission denied for host login1, do you want to deploy the salt-ssh
key? (password required):
[Y/n] Y
Password for root@login1:
login1:
    True
 2017-01-25 12:43:11 -05:00
rallytime
49f57ba3f1 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/utils/win_functions.py
 2017-01-25 09:59:29 -07:00
Thomas S Hatch
4ae98ca2b6 make sure to copy the top dict reference since we are moding it 2017-01-25 09:44:16 -07:00
Thomas S Hatch
68d6449174 When we generate the pillar we should send in the master opts 
This better reflects how salt works per #38830
 2017-01-25 09:39:27 -07:00
Mircea Ulinic
317fb48ec7 net runner doc 2017-01-25 15:54:45 +00:00
Mircea Ulinic
cec75cd569 New runner: net finder 2017-01-25 15:53:01 +00:00
rajvidhimar
60d06df00a Implemented code review changes and made it autopep8 compliant 2017-01-25 17:13:48 +05:30
Jason Pack
60a095decd Add port option to proxy 
Added port parameter to junos device proxy
 2017-01-24 13:15:56 -05:00
Roche, Damien
1389c510ce fixed lint issues 2017-01-24 16:13:20 +00:00
Mike Place
0e102da679 Merge pull request #38887 from cro/vmware_reset_vm 
Enable resetting a VM via salt-cloud & VMware driver
 2017-01-24 08:22:35 -07:00
Mike Place
5ff5e97598 Merge pull request #38889 from cro/vmware_reset_vm_201611 
Backport #38887 to 2016.11: Call correct function for resetting a VM
 2017-01-24 08:20:28 -07:00
Roche, Damien
b3582f7a62 fixed lint issues 2017-01-24 15:19:36 +00:00
Mike Place
53d0aa8855 Merge pull request #38891 from UtahDave/fix_cassandra_protocol_version 
Proper function parameter default
 2017-01-24 08:06:08 -07:00
Mike Place
2aea960819 Merge pull request #38895 from clallen/sunos-cpu_model-grain-fix 
Fix for "cpu_model" core grain on some SPARC systems
 2017-01-24 08:03:06 -07:00
Mike Place
c680ee3174 Merge pull request #38904 from terminalmage/docs 
Add top file merging docs to the master config file documentation
 2017-01-24 07:59:25 -07:00